diff options
Diffstat (limited to 'pyraf')
| -rw-r--r-- | pyraf/bld.bat | 4 | ||||
| -rw-r--r-- | pyraf/build.sh | 2 | ||||
| -rw-r--r-- | pyraf/meta.yaml | 15 |
3 files changed, 10 insertions, 11 deletions
diff --git a/pyraf/bld.bat b/pyraf/bld.bat index 976d3b9..7fba400 100644 --- a/pyraf/bld.bat +++ b/pyraf/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/pyraf/build.sh b/pyraf/build.sh index 110c3f4..4ce4164 100644 --- a/pyraf/build.sh +++ b/pyraf/build.sh @@ -9,4 +9,4 @@ set +e 2to3 -w . fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml index b3ce826..32f8503 100644 --- a/pyraf/meta.yaml +++ b/pyraf/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'pyraf' %} -{% 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 }} @@ -28,8 +29,8 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - d2to1 @@ -41,7 +42,7 @@ requirements: - pyobjc-framework-quartz [osx] - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git |