diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/conda_build_config.yaml | 3 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 2 | ||||
| -rw-r--r-- | build/jenkins-build.sh | 44 |
4 files changed, 7 insertions, 44 deletions
@@ -1,4 +1,6 @@ # CCPi-Framework +[](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Framework/) + Basic Python Framework for CIL This package aims at ensuring a longer life and easy extensibility of the CIL software. This package provides a common framework, hence the name, for the analysis of data in the CT pipeline and quick development of novel reconstruction algorithms. diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index b7977f3..96a211f 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -3,5 +3,6 @@ python: - 3.5 - 3.6 numpy: - - 1.12 + # TODO investigage, as it doesn't currently build with cvxp, requires >1.14 + #- 1.12 - 1.15 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 840590f..1b7cae6 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -2,7 +2,6 @@ package: name: ccpi-framework version: {{ environ['CIL_VERSION'] }} - build: preserve_egg_dir: False script_env: @@ -21,6 +20,7 @@ requirements: - setuptools run: + - {{ pin_compatible('numpy', max_pin='x.x') }} - python - numpy - scipy diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 31b81d2..009d43d 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,43 +1,3 @@ #!/usr/bin/env bash -if [[ -n ${CIL_VERSION} ]] -then - echo Using defined version: $CIL_VERSION -else - export CIL_VERSION=0.10.4 - echo Defining version: $CIL_VERSION -fi -# Script to builds source code in Jenkins environment -# module try-load conda - -# install miniconda if the module is not present -if hash conda 2>/dev/null; then - echo using conda -else - if [ ! -f Miniconda3-latest-Linux-x86_64.sh ]; then - wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - chmod +x Miniconda3-latest-Linux-x86_64.sh - fi - ./Miniconda3-latest-Linux-x86_64.sh -u -b -p . - PATH=$PATH:./bin -fi - -# presume that git clone is done before this script is launched, if not, uncomment -# git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit -conda install -y conda-build - -# need to call first build -conda build Wrappers/Python/conda-recipe -c conda-forge -c ccpi -# then need to call the same with --output -export REG_FILES=`conda build Wrappers/Python/conda-recipe --output` -# REG_FILES variable should contain output files -echo files created: $REG_FILES -#upload to anaconda -if [[ -n ${CCPI_CONDA_TOKEN} ]] -then - conda install anaconda-client - while read -r outfile; do - anaconda -v -t ${CCPI_CONDA_TOKEN} upload $outfile --force --label dev - done <<< "$REG_FILES" -else - echo CCPI_CONDA_TOKEN not defined, will not upload to anaconda. -fi +export CCPI_BUILD_ARGS="-c conda-forge -c ccpi" +bash <(curl -L https://raw.githubusercontent.com/vais-ral/CCPi-VirtualMachine/master/scripts/jenkins-build.sh) |