summaryrefslogtreecommitdiff
path: root/drizzlepac
diff options
context:
space:
mode:
Diffstat (limited to 'drizzlepac')
-rw-r--r--drizzlepac/bld.bat8
-rw-r--r--drizzlepac/build.sh5
-rw-r--r--drizzlepac/meta.yaml11
3 files changed, 9 insertions, 15 deletions
diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat
index d1ddf28..39b5e1f 100644
--- a/drizzlepac/bld.bat
+++ b/drizzlepac/bld.bat
@@ -1,7 +1 @@
-
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
-if errorlevel 1 exit 1
-
-python setup.py install || exit 1
-if errorlevel 1 exit 1 \ No newline at end of file
+%PYTHON% setup.py install
diff --git a/drizzlepac/build.sh b/drizzlepac/build.sh
index 3bc9ae7..5a5aeeb 100644
--- a/drizzlepac/build.sh
+++ b/drizzlepac/build.sh
@@ -1,4 +1 @@
-
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
-python setup.py install || exit 1
+$PYTHON setup.py install
diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml
index 78e3347..15b0800 100644
--- a/drizzlepac/meta.yaml
+++ b/drizzlepac/meta.yaml
@@ -1,6 +1,9 @@
{% set name = 'drizzlepac' %}
{% set version = '2.1.21' %}
-{% set number = '0' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
about:
home: https://github.com/spacetelescope/{{ name }}
@@ -19,7 +22,7 @@ requirements:
- astropy >=1.1
- fitsblender
- nictools
- - numpy
+ - numpy {{ numpy }}
- scipy
- stsci.convolve
- stsci.distutils
@@ -33,7 +36,7 @@ requirements:
- stsci.tools
- stwcs
- pyregion
- - python x.x
+ - python {{ python }}
- setuptools
run:
- astropy >=1.1
@@ -53,7 +56,7 @@ requirements:
- stwcs
- pyregion
- setuptools
- - python x.x
+ - python
source:
git_tag: {{ version }}