Merge pull request #15 from TomasKulhanek/master

Universal build script

2 files changed, 4 insertions, 46 deletions

diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index 965d81d..2dd8aab 100755
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -2,7 +2,6 @@ package:
   name: ccpi-astra
   version: {{ environ['CIL_VERSION'] }}
 
-
 build:
   preserve_egg_dir: False
   script_env:
@@ -16,6 +15,7 @@ requirements:
     - setuptools
 
   run:
+    - {{ pin_compatible('numpy', max_pin='x.x') }}
     - python
     - numpy
     - scipy
@@ -25,4 +25,4 @@ requirements:
 about:
   home: http://www.ccpi.ac.uk
   license:  GPLv3
-  summary: 'CCPi Toolbox'
+  summary: 'CCPi Toolbox'
\ No newline at end of file
diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh
index 25c7228..6c8360c 100644
--- a/build/jenkins-build.sh
+++ b/build/jenkins-build.sh
@@ -1,45 +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
-#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 -c conda-forge -c ccpi -c astra-toolbox
-# 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
+export CCPI_BUILD_ARGS="-c conda-forge -c ccpi -c astra-toolbox"
+bash <(curl -L https://raw.githubusercontent.com/vais-ral/CCPi-VirtualMachine/master/scripts/jenkins-build.sh)