summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python
diff options
context:
space:
mode:
Diffstat (limited to 'Wrappers/Python')
-rw-r--r--Wrappers/Python/conda-recipe/conda_build_config.yaml3
-rw-r--r--Wrappers/Python/conda-recipe/meta.yaml2
2 files changed, 3 insertions, 2 deletions
diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml
index b7977f3..96a211f 100644
--- a/Wrappers/Python/conda-recipe/conda_build_config.yaml
+++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml
@@ -3,5 +3,6 @@ python:
- 3.5
- 3.6
numpy:
- - 1.12
+ # TODO investigage, as it doesn't currently build with cvxp, requires >1.14
+ #- 1.12
- 1.15
diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index 840590f..1b7cae6 100644
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -2,7 +2,6 @@ package:
name: ccpi-framework
version: {{ environ['CIL_VERSION'] }}
-
build:
preserve_egg_dir: False
script_env:
@@ -21,6 +20,7 @@ requirements:
- setuptools
run:
+ - {{ pin_compatible('numpy', max_pin='x.x') }}
- python
- numpy
- scipy