summaryrefslogtreecommitdiff
path: root/stistools
diff options
context:
space:
mode:
Diffstat (limited to 'stistools')
-rw-r--r--stistools/bld.bat8
-rw-r--r--stistools/build.sh5
-rw-r--r--stistools/meta.yaml11
3 files changed, 9 insertions, 15 deletions
diff --git a/stistools/bld.bat b/stistools/bld.bat
index d1ddf28..39b5e1f 100644
--- a/stistools/bld.bat
+++ b/stistools/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/stistools/build.sh b/stistools/build.sh
index 5e8b365..5a5aeeb 100644
--- a/stistools/build.sh
+++ b/stistools/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 \ No newline at end of file
+$PYTHON setup.py install
diff --git a/stistools/meta.yaml b/stistools/meta.yaml
index 6b84788..42f03cf 100644
--- a/stistools/meta.yaml
+++ b/stistools/meta.yaml
@@ -1,6 +1,9 @@
{% set name = 'stistools' %}
{% set version = '1.1' %}
-{% set number = '1' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '2' %}
about:
home: https://github.com/spacetelescope/{{ name }}
@@ -22,14 +25,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_url: https://github.com/spacetelescope/{{ name }}.git