diff options
| author | vagrant <vagrant@localhost.localdomain> | 2019-01-08 14:30:20 +0000 |
|---|---|---|
| committer | vagrant <vagrant@localhost.localdomain> | 2019-01-08 14:30:20 +0000 |
| commit | 865c3b390641a27ecc8a132ca7bad543756f871f (patch) | |
| tree | 368e1c012db06b513bd51e92ba746bbcfd1975fe | |
| parent | 125924cb3a553ae1e0341a731531c4d4320b5d8f (diff) | |
| download | regularization-865c3b390641a27ecc8a132ca7bad543756f871f.tar.gz regularization-865c3b390641a27ecc8a132ca7bad543756f871f.tar.bz2 regularization-865c3b390641a27ecc8a132ca7bad543756f871f.tar.xz regularization-865c3b390641a27ecc8a132ca7bad543756f871f.zip | |
ADD: variants, list of files in exported variable REG_FILES
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 10 | ||||
| -rwxr-xr-x | build/jenkins-build.sh | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 808493e..e3258ff 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -1,8 +1,7 @@ package: name: ccpi-regulariser - version: 0.10.3 - - + version: {{CIL_VERSION}} + build: preserve_egg_dir: False number: 0 @@ -16,7 +15,7 @@ test: requirements: build: - python - - numpy x.x + - numpy {{ numpy }} - setuptools - cython - vc 14 # [win and py36] @@ -25,8 +24,9 @@ requirements: - cmake run: + - {{ pin_compatible('numpy', max_pin='x.x') }} - python - - numpy x.x + - numpy - vc 14 # [win and py36] - vc 14 # [win and py35] - vc 9 # [win and py27] diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 0c397b1..1babeab 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -26,4 +26,4 @@ else echo Defining version: $CIL_VERSION fi #cd CCPi-Regularisation-Toolkit # already there by jenkins -conda build Wrappers/Python/conda-recipe +export REG_FILES=`conda build Wrappers/Python/conda-recipe` |