summaryrefslogtreecommitdiff
path: root/poppy
diff options
context:
space:
mode:
Diffstat (limited to 'poppy')
-rw-r--r--poppy/bld.bat3
-rw-r--r--poppy/build.sh2
-rw-r--r--poppy/meta.yaml11
3 files changed, 9 insertions, 7 deletions
diff --git a/poppy/bld.bat b/poppy/bld.bat
index b290566..760380e 100644
--- a/poppy/bld.bat
+++ b/poppy/bld.bat
@@ -1,3 +1,2 @@
-python setup.py install
-if errorlevel 1 exit 1 \ No newline at end of file
+%PYTHON% setup.py install
diff --git a/poppy/build.sh b/poppy/build.sh
index 4b71885..56f0b30 100644
--- a/poppy/build.sh
+++ b/poppy/build.sh
@@ -1,2 +1,2 @@
-python setup.py install || exit 1 \ No newline at end of file
+$PYTHON setup.py install \ No newline at end of file
diff --git a/poppy/meta.yaml b/poppy/meta.yaml
index 972ac7a..0f4144b 100644
--- a/poppy/meta.yaml
+++ b/poppy/meta.yaml
@@ -1,7 +1,10 @@
{% set name = 'poppy' %}
{% set version = '0.6.1' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
{% set tag = 'v' + version %}
-{% set number = '0' %}
+{% set number = '1' %}
about:
home: https://github.com/mperrin/{{ name }}
@@ -20,13 +23,13 @@ package:
requirements:
build:
- astropy >=1.1
- - numpy
+ - numpy {{ numpy }}
- scipy
- matplotlib
- six [py27]
- enum34 [py27]
- setuptools
- - python x.x
+ - python {{ python }}
run:
- astropy >=1.1
- numpy
@@ -35,7 +38,7 @@ requirements:
- six [py27]
- enum34 [py27]
- setuptools
- - python x.x
+ - python
source:
git_tag: {{ tag }}