diff options
Diffstat (limited to 'stsci.distutils')
| -rw-r--r-- | stsci.distutils/bld.bat | 4 | ||||
| -rw-r--r-- | stsci.distutils/build.sh | 2 | ||||
| -rw-r--r-- | stsci.distutils/meta.yaml | 15 |
3 files changed, 10 insertions, 11 deletions
diff --git a/stsci.distutils/bld.bat b/stsci.distutils/bld.bat index eb68153..371bd69 100644 --- a/stsci.distutils/bld.bat +++ b/stsci.distutils/bld.bat @@ -1,7 +1,5 @@ echo This d2to1 hack is deadly. REM pip install --no-deps --upgrade --force d2to1 -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/stsci.distutils/build.sh b/stsci.distutils/build.sh index 4b71885..6bd6081 100644 --- a/stsci.distutils/build.sh +++ b/stsci.distutils/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/stsci.distutils/meta.yaml b/stsci.distutils/meta.yaml index 1ed7129..ec67939 100644 --- a/stsci.distutils/meta.yaml +++ b/stsci.distutils/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.distutils' %} -{% 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,13 +21,13 @@ requirements: build: - d2to1 - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - nose - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git |