summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md6
-rw-r--r--Wrappers/Python/conda-recipe/conda_build_config.yaml2
-rwxr-xr-xWrappers/Python/conda-recipe/meta.yaml6
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 |
-|--------|-------------|
-| [![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'