From b62fb5d06279f9cea41e7abc8e2d65aa6ee66178 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Fri, 11 Jan 2019 14:24:31 +0100 Subject: UPDATE: jenkins build and variants --- Wrappers/Python/conda-recipe/conda_build_config.yaml | 7 +++++++ Wrappers/Python/conda-recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index ca91ed0..965d81d 100755 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -12,7 +12,7 @@ build: requirements: build: - python - - numpy + - numpy {{ numpy }} - setuptools run: -- cgit v1.2.3 From 26443ce2065c6150829b03fa295a36e66edf1a60 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 14 Jan 2019 13:37:32 +0100 Subject: UPDATE pin_compatible --- Wrappers/Python/conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'Wrappers') diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 965d81d..b367948 100755 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -16,6 +16,7 @@ requirements: - setuptools run: + - {{ pin_compatible('numpy', max_pin='x.x') }} - python - numpy - scipy -- cgit v1.2.3 From 3b1bd1bbe7a65fe055d09ed1281e68e452879c01 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 14 Jan 2019 13:47:32 +0100 Subject: update --- Wrappers/Python/conda-recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Wrappers') diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index b367948..2dd8aab 100755 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -2,7 +2,6 @@ package: name: ccpi-astra version: {{ environ['CIL_VERSION'] }} - build: preserve_egg_dir: False script_env: @@ -26,4 +25,4 @@ requirements: about: home: http://www.ccpi.ac.uk license: GPLv3 - summary: 'CCPi Toolbox' + summary: 'CCPi Toolbox' \ No newline at end of file -- cgit v1.2.3