diff options
Diffstat (limited to 'wfpc2tools')
| -rw-r--r-- | wfpc2tools/bld.bat | 4 | ||||
| -rw-r--r-- | wfpc2tools/build.sh | 2 | ||||
| -rw-r--r-- | wfpc2tools/meta.yaml | 15 |
3 files changed, 10 insertions, 11 deletions
diff --git a/wfpc2tools/bld.bat b/wfpc2tools/bld.bat index 976d3b9..7fba400 100644 --- a/wfpc2tools/bld.bat +++ b/wfpc2tools/bld.bat @@ -1,5 +1,3 @@ -if errorlevel 1 exit 1 -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/wfpc2tools/build.sh b/wfpc2tools/build.sh index 5b1a523..d8b4616 100644 --- a/wfpc2tools/build.sh +++ b/wfpc2tools/build.sh @@ -25,4 +25,4 @@ if [ $PY3K -ne 0 ] ; then 2to3 -w . fi -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/wfpc2tools/meta.yaml b/wfpc2tools/meta.yaml index 56e66cf..337e85b 100644 --- a/wfpc2tools/meta.yaml +++ b/wfpc2tools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'wfpc2tools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -25,15 +26,15 @@ requirements: - stsci.imagestats - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - scipy - stsci.imagestats - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git |