diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-11 15:44:30 +0000 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-01-11 15:44:30 +0000 |
| commit | ba9994e131dae1e1c09f156df12327f2ef10beb4 (patch) | |
| tree | 772ecf39e6f0ce1b3fe0d7d2ece4885a03a0fd44 /Wrappers | |
| parent | c324276a3fc2b0fec6c938691fb61c4b42442751 (diff) | |
| download | framework-ba9994e131dae1e1c09f156df12327f2ef10beb4.tar.gz framework-ba9994e131dae1e1c09f156df12327f2ef10beb4.tar.bz2 framework-ba9994e131dae1e1c09f156df12327f2ef10beb4.tar.xz framework-ba9994e131dae1e1c09f156df12327f2ef10beb4.zip | |
UPDATE: CIL VERSION needs to be set (#173)
* UPDATE: CIL VERSION needs to be set
* UPDATE: jenkins build and variants
* UPDATE: channels conda-forge and ccpi
Diffstat (limited to 'Wrappers')
| -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 |
4 files changed, 16 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: |