From 5fe09e04771ed62d05bd3154ea182d1b99c5d8ce Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Thu, 3 Jan 2019 13:23:19 +0000 Subject: UPDATE: CIL VERSION needs to be set --- Wrappers/Python/conda-recipe/bld.bat | 4 ++++ Wrappers/Python/conda-recipe/build.sh | 4 ++++ Wrappers/Python/conda-recipe/meta.yaml | 9 ++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Wrappers/Python/conda-recipe/bld.bat b/Wrappers/Python/conda-recipe/bld.bat index d317f54..97a4e62 100644 --- a/Wrappers/Python/conda-recipe/bld.bat +++ b/Wrappers/Python/conda-recipe/bld.bat @@ -1,4 +1,8 @@ +IF NOT DEFINED CIL_VERSION ( +ECHO CIL_VERSION Not Defined. +exit 1 +) ROBOCOPY /E "%RECIPE_DIR%\.." "%SRC_DIR%" %PYTHON% setup.py build_py diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index 2e68519..43e85d5 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -1,3 +1,7 @@ +if [ -z "$CIL_VERSION" ]; then + echo "Need to set CIL_VERSION" + exit 1 +fi mkdir ${SRC_DIR}/ccpi cp -r "${RECIPE_DIR}/../../../" ${SRC_DIR}/ccpi diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 5de01c5..fbfbafa 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -1,14 +1,13 @@ package: name: ccpi-framework - version: 0.11.3 + version: {{ environ['CIL_VERSION'] }} build: preserve_egg_dir: False -#script_env: -# - CIL_VERSION - number: 0 - + script_env: + - CIL_VERSION + #number: 0 test: requires: -- cgit v1.2.3 From ff4a9962d3701b30dc6709500ee3492788b6977b Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Fri, 11 Jan 2019 13:32:17 +0100 Subject: UPDATE: jenkins build and variants --- .../Python/conda-recipe/conda_build_config.yaml | 3 ++ Wrappers/Python/conda-recipe/meta.yaml | 1 + build/jenkins-build.sh | 45 ++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 build/jenkins-build.sh diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index 5dd08f5..b7977f3 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -2,3 +2,6 @@ python: - 2.7 # [not win] - 3.5 - 3.6 +numpy: + - 1.12 + - 1.15 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index fbfbafa..840590f 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -17,6 +17,7 @@ test: requirements: build: - python + - numpy {{ numpy }} - setuptools run: diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh new file mode 100644 index 0000000..e45a330 --- /dev/null +++ b/build/jenkins-build.sh @@ -0,0 +1,45 @@ +#!/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 +#export CIL_VERSION=0.10.2 +#cd CCPi-Regularisation-Toolkit # already there by jenkins +# need to call first build +conda build Wrappers/Python/conda-recipe +# then need to call the same with --output +#- otherwise no build is done :-(, just fake file names are generated +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 -- cgit v1.2.3 From 92bdb9f29baf03f6140e9b6269ed1d8c7c42520b Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Fri, 11 Jan 2019 13:34:23 +0100 Subject: UPDATE: channels conda-roge and ccp --- build/jenkins-build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index e45a330..31b81d2 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -24,12 +24,10 @@ 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 -#export CIL_VERSION=0.10.2 -#cd CCPi-Regularisation-Toolkit # already there by jenkins + # need to call first build -conda build Wrappers/Python/conda-recipe +conda build Wrappers/Python/conda-recipe -c conda-forge -c ccpi # then need to call the same with --output -#- otherwise no build is done :-(, just fake file names are generated export REG_FILES=`conda build Wrappers/Python/conda-recipe --output` # REG_FILES variable should contain output files echo files created: $REG_FILES -- cgit v1.2.3 From 37624a19d3672c87ca75d2ac05c5d72955e789dc Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 14 Jan 2019 13:51:15 +0100 Subject: update pin-compatible --- Wrappers/Python/conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 840590f..29a2b12 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -21,6 +21,7 @@ requirements: - setuptools run: + - {{ pin_compatible('numpy', max_pin='x.x') }} - python - numpy - scipy -- cgit v1.2.3 From 70321f2f61a2404330732c16c06ae8cbdc454985 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 14 Jan 2019 13:52:19 +0100 Subject: update --- Wrappers/Python/conda-recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 29a2b12..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: -- cgit v1.2.3 From 5fc7abb8688dae095d0c8274ae5679c44a9f4149 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 12:04:10 +0000 Subject: Update jenkins-build.sh --- build/jenkins-build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 31b81d2..f1b9ad3 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash + +# define CIL_VERSION if not defined by calling environment if [[ -n ${CIL_VERSION} ]] then echo Using defined version: $CIL_VERSION @@ -6,12 +8,10 @@ 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 +# install miniconda if it is not already present if hash conda 2>/dev/null; then - echo using conda + echo using preinstalled conda else if [ ! -f Miniconda3-latest-Linux-x86_64.sh ]; then wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -- cgit v1.2.3 From 1cb5c41410d2c0db25849290fe7eeb5e960f053d Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:01:43 +0000 Subject: Update jenkins-build.sh --- build/jenkins-build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index f1b9ad3..dcdf3da 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash # define CIL_VERSION if not defined by calling environment -if [[ -n ${CIL_VERSION} ]] -then +if [[ -n ${CIL_VERSION} ]]; then echo Using defined version: $CIL_VERSION else export CIL_VERSION=0.10.4 @@ -13,6 +12,7 @@ fi if hash conda 2>/dev/null; then echo using preinstalled conda else + echo installing miniconda 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 @@ -22,7 +22,7 @@ else 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 +# git clone https://github.com/vais-ral/CCPi-Framework.git conda install -y conda-build # need to call first build -- cgit v1.2.3 From 4f28f9195c1c7b56f679410ae41a7627d4bb6382 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:08:21 +0000 Subject: Update conda_build_config.yaml --- Wrappers/Python/conda-recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index b7977f3..7afbb0f 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -4,4 +4,4 @@ python: - 3.6 numpy: - 1.12 - - 1.15 + # doesn't build with - 1.15 -- cgit v1.2.3 From 10551e618a601480727798ddded8feeda844e327 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:19:17 +0000 Subject: Update conda_build_config.yaml --- Wrappers/Python/conda-recipe/conda_build_config.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index 7afbb0f..0706479 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 - # doesn't build with - 1.15 + # doesn't build with, cvxp requires >1.14 + #- 1.12 + - 1.15 -- cgit v1.2.3 From 1fe2b12b9f398ce045ebd7d319ea2d2fbd7f5e45 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:35:33 +0000 Subject: Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 49714e8..d6a2d64 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # CCPi-Framework +Last commit: [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) 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. -- cgit v1.2.3 From 4dfec332eaf26ec3d015475e3f3dc6950b8c204f Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:36:03 +0000 Subject: Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d6a2d64..3c86f00 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # CCPi-Framework -Last commit: [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) +[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) + 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. -- cgit v1.2.3 From 38d1b956a72b858a996403e1305d16e24aca9c09 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:37:35 +0000 Subject: Update README.md ADD: build status from jenkins embeddable build status plugin --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c86f00..c1133bd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # CCPi-Framework -[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) +[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Framework/) Basic Python Framework for CIL -- cgit v1.2.3 From a5bfbc29e1dca36cb36a1aaf44549cfd97efdb9d Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 28 Jan 2019 12:17:51 +0000 Subject: UPDATE: using universal build --- build/jenkins-build.sh | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) 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) -- cgit v1.2.3