From 865c3b390641a27ecc8a132ca7bad543756f871f Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@localhost.localdomain>
Date: Tue, 8 Jan 2019 14:30:20 +0000
Subject: ADD: variants, list of files in exported variable REG_FILES
---
Wrappers/Python/conda-recipe/meta.yaml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'Wrappers')
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]
--
cgit v1.2.3
From ca5c4e281d0b103ebc544a096b5ac90dd74eb215 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@localhost.localdomain>
Date: Tue, 8 Jan 2019 15:34:17 +0000
Subject: ADD: variants
---
Wrappers/Python/conda-recipe/conda_build_config.yaml | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 Wrappers/Python/conda-recipe/conda_build_config.yaml
(limited to 'Wrappers')
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
--
cgit v1.2.3
From 5e436eab5cea50569df9c85159be69d8e88688f0 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@localhost.localdomain>
Date: Mon, 21 Jan 2019 16:41:10 +0000
Subject: UPDATE: propagate CIL_VERSION
---
Wrappers/Python/CMakeLists.txt | 2 +-
Wrappers/Python/conda-recipe/build.sh | 1 +
Wrappers/Python/conda-recipe/meta.yaml | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'Wrappers')
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/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index e3258ff..9fe813d 100644
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -5,6 +5,8 @@ package:
build:
preserve_egg_dir: False
number: 0
+ script_env:
+ - CIL_VERSION
test:
files:
--
cgit v1.2.3
From 2694ad1b18d14fcfd7d57ded7290ebd1bf845fda Mon Sep 17 00:00:00 2001
From: Kazantsev <daniil.kazantsev@diamond.ac.uk>
Date: Wed, 23 Jan 2019 11:52:40 +0000
Subject: fixes gpu build on windows
---
Wrappers/Python/conda-recipe/meta.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'Wrappers')
diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index 9fe813d..9dd5544 100644
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -12,7 +12,7 @@ test:
files:
- lena_gray_512.tif
requires:
- - pillow
+ - pillow=4.1.1
requirements:
build:
--
cgit v1.2.3