summaryrefslogtreecommitdiff
path: root/calcos
diff options
context:
space:
mode:
Diffstat (limited to 'calcos')
-rw-r--r--calcos/bld.bat3
-rw-r--r--calcos/build.sh4
-rw-r--r--calcos/meta.yaml11
3 files changed, 9 insertions, 9 deletions
diff --git a/calcos/bld.bat b/calcos/bld.bat
index 5d42b68..7fba400 100644
--- a/calcos/bld.bat
+++ b/calcos/bld.bat
@@ -1,4 +1,3 @@
-python setup.py install
-if errorlevel 1 exit 1 \ No newline at end of file
+%PYTHON% setup.py install
diff --git a/calcos/build.sh b/calcos/build.sh
index 52582b9..b442f84 100644
--- a/calcos/build.sh
+++ b/calcos/build.sh
@@ -1,4 +1,2 @@
-
-pip install --no-deps --upgrade --force d2to1
sed -i -e 's|pyfits.*|astropy (>=0.3.1)|' setup.cfg
-python setup.py install || exit 1 \ No newline at end of file
+$PYTHON setup.py install
diff --git a/calcos/meta.yaml b/calcos/meta.yaml
index 8e139e0..1243415 100644
--- a/calcos/meta.yaml
+++ b/calcos/meta.yaml
@@ -1,6 +1,9 @@
{% set name = 'calcos' %}
{% set version = '3.2.1' %}
-{% set number = '0' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
about:
home: https://github.com/spacetelescope/{{ name }}
@@ -21,14 +24,14 @@ requirements:
- stsci.distutils
- stsci.tools
- setuptools
- - numpy
- - python x.x
+ - numpy {{ numpy }}
+ - python {{ python }}
run:
- astropy >=1.1
- scipy
- stsci.tools
- numpy
- - python x.x
+ - python
source:
git_tag: {{ version }}