diff options
Diffstat (limited to 'webbpsf')
| -rw-r--r-- | webbpsf/bld.bat | 3 | ||||
| -rw-r--r-- | webbpsf/build.sh | 2 | ||||
| -rw-r--r-- | webbpsf/meta.yaml | 15 |
3 files changed, 10 insertions, 10 deletions
diff --git a/webbpsf/bld.bat b/webbpsf/bld.bat index b290566..760380e 100644 --- a/webbpsf/bld.bat +++ b/webbpsf/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/webbpsf/build.sh b/webbpsf/build.sh index 4b71885..6bd6081 100644 --- a/webbpsf/build.sh +++ b/webbpsf/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/webbpsf/meta.yaml b/webbpsf/meta.yaml index d797e79..494429a 100644 --- a/webbpsf/meta.yaml +++ b/webbpsf/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'webbpsf' %} -{% 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' %} # Keep in mind: # webbpsf-data is version-locked to prevent older builds from picking @@ -26,7 +27,7 @@ requirements: build: - nose - astropy - - numpy + - numpy {{ numpy }} - scipy - matplotlib - poppy @@ -34,7 +35,7 @@ requirements: - six [py27] - webbpsf-data >=0.4.1 - setuptools - - python x.x + - python {{ python }} run: - nose @@ -47,7 +48,7 @@ requirements: - six [py27] - webbpsf-data >=0.4.1 - setuptools - - python x.x + - python source: git_url: https://github.com/mperrin/{{ name }}.git |