diff options
Diffstat (limited to 'nictools')
| -rw-r--r-- | nictools/bld.bat | 3 | ||||
| -rw-r--r-- | nictools/build.sh | 2 | ||||
| -rw-r--r-- | nictools/meta.yaml | 15 |
3 files changed, 10 insertions, 10 deletions
diff --git a/nictools/bld.bat b/nictools/bld.bat index abdd1e3..5db04b7 100644 --- a/nictools/bld.bat +++ b/nictools/bld.bat @@ -1,4 +1,3 @@ -python setup.py install +%PYTHON% setup.py install 2to3 -w . -if errorlevel 1 exit 1
\ No newline at end of file diff --git a/nictools/build.sh b/nictools/build.sh index 4b71885..6bd6081 100644 --- a/nictools/build.sh +++ b/nictools/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/nictools/meta.yaml b/nictools/meta.yaml index 8d7028a..5ddc9ad 100644 --- a/nictools/meta.yaml +++ b/nictools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'nictools' %} -{% 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 }} @@ -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 |