diff options
| author | vagrant <vagrant@localhost.localdomain> | 2019-01-28 11:50:20 +0000 |
|---|---|---|
| committer | vagrant <vagrant@localhost.localdomain> | 2019-01-28 11:50:20 +0000 |
| commit | 0d74c50c48ae518fedb44e5d04a148eaa02b485b (patch) | |
| tree | 9e000d8a05a58d101cd838f9d914bbeb9dcee537 /Wrappers | |
| parent | a293e77c132f8eaa2b1dd52ae9b926b90f72cfd0 (diff) | |
| parent | 4aa979cd6cd0e437ab5cc02367adf140d63030b6 (diff) | |
| download | regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.tar.gz regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.tar.bz2 regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.tar.xz regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.zip | |
Merge branch 'master' of https://github.com/vais-ral/CCPi-Regularisation-Toolkit
Conflicts:
build/jenkins-build.sh
Diffstat (limited to 'Wrappers')
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 1 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/conda_build_config.yaml | 7 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 14 |
4 files changed, 17 insertions, 7 deletions
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt index d86d0ea..c2ef855 100644 --- a/Wrappers/Python/CMakeLists.txt +++ b/Wrappers/Python/CMakeLists.txt @@ -9,7 +9,7 @@ project(regulariserPython) #set (CIL_VERSION $ENV{CIL_VERSION} CACHE INTERNAL "Core Imaging Library version" FORCE) # conda orchestrated build -message("CIL_VERSION ${CIL_VERSION}") +message("CIL_VERSION: ${CIL_VERSION}") #include (GenerateExportHeader) find_package(PythonInterp REQUIRED) diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index eec7c2f..39c0f2c 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -5,6 +5,7 @@ cp -rv "$RECIPE_DIR/../../../Core" "$SRC_DIR/Core" cd $SRC_DIR ##cuda=off + cmake -G "Unix Makefiles" $RECIPE_DIR/../../../ -DBUILD_PYTHON_WRAPPER=ON -DCONDA_BUILD=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB=$CONDA_PREFIX/lib -DLIBRARY_INC=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml new file mode 100644 index 0000000..b7977f3 --- /dev/null +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -0,0 +1,7 @@ +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 808493e..9dd5544 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -1,22 +1,23 @@ package: name: ccpi-regulariser - version: 0.10.3 - - + version: {{CIL_VERSION}} + build: preserve_egg_dir: False number: 0 + script_env: + - CIL_VERSION test: files: - lena_gray_512.tif requires: - - pillow + - pillow=4.1.1 requirements: build: - python - - numpy x.x + - numpy {{ numpy }} - setuptools - cython - vc 14 # [win and py36] @@ -25,8 +26,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] |