diff options
Diffstat (limited to 'fitsblender')
| -rw-r--r-- | fitsblender/bld.bat | 4 | ||||
| -rw-r--r-- | fitsblender/build.sh | 2 | ||||
| -rw-r--r-- | fitsblender/meta.yaml | 15 |
3 files changed, 10 insertions, 11 deletions
diff --git a/fitsblender/bld.bat b/fitsblender/bld.bat index 976d3b9..7fba400 100644 --- a/fitsblender/bld.bat +++ b/fitsblender/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/fitsblender/build.sh b/fitsblender/build.sh index 10954df..9104e24 100644 --- a/fitsblender/build.sh +++ b/fitsblender/build.sh @@ -1,3 +1,3 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/fitsblender/meta.yaml b/fitsblender/meta.yaml index 04ee992..1eb03a3 100644 --- a/fitsblender/meta.yaml +++ b/fitsblender/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'fitsblender' %} -{% 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: http://github.com/spacetelescope/{{ name }} @@ -23,14 +24,14 @@ requirements: - astropy - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git |