diff options
| -rw-r--r-- | Wrappers/Python/conda-recipe/bld.bat | 4 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 4 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/conda_build_config.yaml | 3 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 10 | ||||
| -rw-r--r-- | build/jenkins-build.sh | 43 | 
5 files changed, 59 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/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 5de01c5..840590f 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: @@ -18,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..31b81d2 --- /dev/null +++ b/build/jenkins-build.sh @@ -0,0 +1,43 @@ +#!/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  | 
