diff options
Diffstat (limited to 'stginga')
| -rw-r--r-- | stginga/bld.bat | 3 | ||||
| -rw-r--r-- | stginga/build.sh | 3 | ||||
| -rw-r--r-- | stginga/meta.yaml | 15 | 
3 files changed, 10 insertions, 11 deletions
| diff --git a/stginga/bld.bat b/stginga/bld.bat index b290566..760380e 100644 --- a/stginga/bld.bat +++ b/stginga/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/stginga/build.sh b/stginga/build.sh index 4b71885..5a5aeeb 100644 --- a/stginga/build.sh +++ b/stginga/build.sh @@ -1,2 +1 @@ - -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/stginga/meta.yaml b/stginga/meta.yaml index f80694e..8727f9f 100644 --- a/stginga/meta.yaml +++ b/stginga/meta.yaml @@ -1,8 +1,9 @@  {% set name = 'stginga' %} -{% 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 }} @@ -20,17 +21,17 @@ requirements:      build:      - ginga      - astropy -    - numpy +    - numpy {{ numpy }}      - scipy      - setuptools -    - python x.x +    - python {{ python }}      run:      - ginga      - astropy      - numpy      - scipy -    - python x.x +    - python  source:      git_url: https://github.com/spacetelescope/{{ name }}.git | 
