diff options
author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-06-24 13:45:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-24 13:45:38 +0100 |
commit | 7a821a53a23cb55e7ba11b80395b3a9c3f6e310d (patch) | |
tree | 621c10f2992049896bf87a6e2b82037e88a5c440 | |
parent | d98750ce78f6f20c2eb87cb6d41b90e4c0afd56a (diff) | |
download | astra-wrapper-7a821a53a23cb55e7ba11b80395b3a9c3f6e310d.tar.gz astra-wrapper-7a821a53a23cb55e7ba11b80395b3a9c3f6e310d.tar.bz2 astra-wrapper-7a821a53a23cb55e7ba11b80395b3a9c3f6e310d.tar.xz astra-wrapper-7a821a53a23cb55e7ba11b80395b3a9c3f6e310d.zip |
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
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | Wrappers/Python/conda-recipe/conda_build_config.yaml | 2 | ||||
-rwxr-xr-x | Wrappers/Python/conda-recipe/meta.yaml | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -1,7 +1,7 @@ -| master build | pull request build | -|--------|-------------| -| [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Astra)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra/) | [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Astra-dev)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra-dev/) | +| Master | Development | Experimental | Anaconda binaries | +|--------|-------------|--------------|-------------------| +| [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Astra)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra/) | [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Astra-dev)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra-dev/) |[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Astra-Experimental)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Astra-Experimental/) | ![conda version](https://anaconda.org/ccpi/ccpi-plugins/badges/version.svg) ![conda last release](https://anaconda.org/ccpi/ccpi-astra/badges/latest_release_date.svg) [![conda platforms](https://anaconda.org/ccpi/ccpi-astra/badges/platforms.svg) ![conda dowloads](https://anaconda.org/ccpi/ccpi-astra/badges/downloads.svg)](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' |