diff options
Diffstat (limited to 'calcos')
| -rw-r--r-- | calcos/bld.bat | 3 | ||||
| -rw-r--r-- | calcos/build.sh | 2 | ||||
| -rw-r--r-- | calcos/meta.yaml | 15 | 
3 files changed, 10 insertions, 10 deletions
| diff --git a/calcos/bld.bat b/calcos/bld.bat index 5d42b68..7fba400 100644 --- a/calcos/bld.bat +++ b/calcos/bld.bat @@ -1,4 +1,3 @@ -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/calcos/build.sh b/calcos/build.sh index 535529d..6bd6081 100644 --- a/calcos/build.sh +++ b/calcos/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/calcos/meta.yaml b/calcos/meta.yaml index cf105e7..2e4b7fd 100644 --- a/calcos/meta.yaml +++ b/calcos/meta.yaml @@ -1,8 +1,9 @@  {% set name = 'calcos' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") -    +".dev" -    +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '2' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{%   set version = version[1:] %} +{% endif %} +{% set number = '3' %}  about:      home: https://github.com/spacetelescope/{{ name }} @@ -23,15 +24,15 @@ requirements:      - scipy      - stsci.tools      - setuptools -    - numpy -    - python x.x +    - numpy {{ numpy }} +    - python {{ python }}      run:      - astropy      - scipy      - stsci.tools      - numpy -    - python x.x +    - python  source:      git_url: https://github.com/spacetelescope/{{ name }}.git | 
