summaryrefslogtreecommitdiff
path: root/drizzlepac
diff options
context:
space:
mode:
Diffstat (limited to 'drizzlepac')
-rw-r--r--drizzlepac/bld.bat4
-rw-r--r--drizzlepac/build.sh2
-rw-r--r--drizzlepac/meta.yaml15
3 files changed, 10 insertions, 11 deletions
diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat
index 726b367..7fba400 100644
--- a/drizzlepac/bld.bat
+++ b/drizzlepac/bld.bat
@@ -1,5 +1,3 @@
-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 63d76ee..9b298cd 100644
--- a/drizzlepac/build.sh
+++ b/drizzlepac/build.sh
@@ -1,3 +1,3 @@
test -f setup.cfg && sed -i -e '/astrolib\.coords.*/d' setup.cfg
-python setup.py install || exit 1 \ No newline at end of file
+$PYTHON setup.py install
diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml
index d44d09c..27b9afd 100644
--- a/drizzlepac/meta.yaml
+++ b/drizzlepac/meta.yaml
@@ -1,8 +1,9 @@
{% set name = 'drizzlepac' %}
-{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0")
- +".dev"
- +environ.get("GIT_DESCRIBE_NUMBER", "0") %}
-{% set number = '0' %}
+{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
about:
home: https://github.com/spacetelescope/drizzlepac.git
@@ -35,8 +36,8 @@ requirements:
- stwcs
- pyregion
- setuptools
- - numpy
- - python x.x
+ - numpy {{ numpy }}
+ - python {{ python }}
run:
- astropy
@@ -55,7 +56,7 @@ requirements:
- pyregion
- setuptools
- numpy
- - python x.x
+ - python
source:
git_url: https://github.com/spacetelescope/{{ name }}.git