From 286c9d0cd069759d090007da647e78afdb937596 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 5 Jan 2018 15:01:53 -0500 Subject: [WIP] Next (#75) * Purge x.x style selectors * Add python jinja2 selectors * Add numpy jinja2 selectors * Add basic build matrix configuration * Delete iraf package; see astroconda/astroconda-iraf * Bump all build revisions * Remove drizzlepac and nose dependencies * Fixup dependencies * Strip newlines in version declaration * Implements new package versioning scheme * Revert sandboxing * Purge old or unnecessary packages * Clean up meta-packages * Use fake version * Minor clean up * Add missing md5 hashes * Python is not a dependency of XPA * Remove GIT_ usage in non-git recipe * Initial commit of asteval * cubeviz: sed patching glue/numpy/pytest * Add missing curly braces * Remove references to pywcs * Add mosviz * Fix up specutils * Forcefully strip all "v" version prefixes. Please stop using them. * Fix ginga * Use PYTHON * Remove d2to1 dep * Remove d2to1 dep * Remove d2to1 dep * Remove d2to1 dep * Remove deprecated JWST pipeline packages * Simplify python builds * Simplify python builds (windows) * Remove d2to1 dep * Remove d2to1 dep * Stop using 2to3 * Remove ATLAS * Move sextractor to mainline * Sextractor Intel MKL integration patches (i.e NO ATLAS) --- photutils/bld.bat | 3 +-- photutils/build.sh | 5 +---- photutils/meta.yaml | 17 ++++++++--------- 3 files changed, 10 insertions(+), 15 deletions(-) (limited to 'photutils') 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 -- cgit