diff options
Diffstat (limited to 'costools')
| -rw-r--r-- | costools/bld.bat | 4 | ||||
| -rw-r--r-- | costools/build.sh | 2 | ||||
| -rw-r--r-- | costools/meta.yaml | 15 | 
3 files changed, 10 insertions, 11 deletions
diff --git a/costools/bld.bat b/costools/bld.bat index 726b367..7fba400 100644 --- a/costools/bld.bat +++ b/costools/bld.bat @@ -1,5 +1,3 @@ -if errorlevel 1 exit 1 -python setup.py install || exit 1 -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/costools/build.sh b/costools/build.sh index 4b71885..6bd6081 100644 --- a/costools/build.sh +++ b/costools/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/costools/meta.yaml b/costools/meta.yaml index 5fd6295..4f0755c 100644 --- a/costools/meta.yaml +++ b/costools/meta.yaml @@ -1,8 +1,9 @@  {% set name = 'costools' %} -{% 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://www.stsci.edu/institute/software_hardware @@ -24,8 +25,8 @@ requirements:      - calcos      - stsci.tools      - setuptools -    - numpy -    - python x.x +    - numpy {{ numpy }} +    - python {{ python }}      run:      - d2to1 @@ -34,7 +35,7 @@ requirements:      - stsci.tools      - setuptools      - numpy -    - python x.x +    - python  source:      git_url: https://github.com/spacetelescope/{{ name }}.git  | 
