diff options
Diffstat (limited to 'photutils')
| -rw-r--r-- | photutils/bld.bat | 3 | ||||
| -rw-r--r-- | photutils/build.sh | 5 | ||||
| -rw-r--r-- | photutils/meta.yaml | 17 |
3 files changed, 10 insertions, 15 deletions
diff --git a/photutils/bld.bat b/photutils/bld.bat index b290566..760380e 100644 --- a/photutils/bld.bat +++ b/photutils/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/photutils/build.sh b/photutils/build.sh index 5e8b365..5a5aeeb 100644 --- a/photutils/build.sh +++ b/photutils/build.sh @@ -1,4 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 || exit 1 -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/photutils/meta.yaml b/photutils/meta.yaml index ad12632..2417653 100644 --- a/photutils/meta.yaml +++ b/photutils/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'photutils' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '3' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '4' %} about: home: https://github.com/astropy/{{ name }} @@ -18,17 +19,15 @@ package: requirements: build: - - d2to1 - - stsci.distutils - nose - astropy - cython - matplotlib - - numpy + - numpy {{ numpy }} - scikit-image - scipy - setuptools - - python x.x + - python {{ python }} run: - astropy @@ -38,7 +37,7 @@ requirements: - scikit-image - scipy - setuptools - - python x.x + - python source: git_url: https://github.com/astropy/{{ name }}.git |