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(-) (limited to 'Wrappers/Python') 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 (limited to 'Wrappers/Python') 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 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(+) (limited to 'Wrappers/Python') 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(-) (limited to 'Wrappers/Python') 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 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(-) (limited to 'Wrappers/Python') 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(-) (limited to 'Wrappers/Python') 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