From 7a821a53a23cb55e7ba11b80395b3a9c3f6e310d Mon Sep 17 00:00:00 2001 From: Edoardo Pasca <edo.paskino@gmail.com> Date: Mon, 24 Jun 2019 13:45:38 +0100 Subject: remove numpy version as this package does not build on numpy (#26) * remove numpy version as this package does not build on numpy * update meta.yaml * updated badges * readded numpy versions * updated numpy versions * added numpy in build section * added numpy versions * removed numpy 1.13 --- README.md | 6 +++--- Wrappers/Python/conda-recipe/conda_build_config.yaml | 2 ++ Wrappers/Python/conda-recipe/meta.yaml | 6 ++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4a6c441..e50f20a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -| master build | pull request build | -|--------|-------------| -| [](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra/) | [](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra-dev/) | +| Master | Development | Experimental | Anaconda binaries | +|--------|-------------|--------------|-------------------| +| [](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra/) | [](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra-dev/) |[](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra-Experimental/) |   [ ](https://anaconda.org/ccpi/ccpi-astra) | # CCPi-astra diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index 6ce25a6..f4d423a 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -5,3 +5,5 @@ python: numpy: - 1.11 - 1.12 + - 1.14 + - 1.15 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 2dd8aab..25ff489 100755 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -11,18 +11,16 @@ build: requirements: build: - python - - numpy {{ numpy }} + - numpy - setuptools run: - {{ pin_compatible('numpy', max_pin='x.x') }} - python - - numpy - - scipy - ccpi-framework - astra-toolbox about: home: http://www.ccpi.ac.uk license: GPLv3 - summary: 'CCPi Toolbox' \ No newline at end of file + summary: 'CCPi Toolbox' -- cgit v1.2.3