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) --- astroimtools/bld.bat | 3 +-- astroimtools/build.sh | 2 +- astroimtools/meta.yaml | 15 ++++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'astroimtools') diff --git a/astroimtools/bld.bat b/astroimtools/bld.bat index c50c85a..760380e 100644 --- a/astroimtools/bld.bat +++ b/astroimtools/bld.bat @@ -1,3 +1,2 @@ -python setup.py install --offline -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/astroimtools/build.sh b/astroimtools/build.sh index b875087..6bd6081 100644 --- a/astroimtools/build.sh +++ b/astroimtools/build.sh @@ -1,2 +1,2 @@ -python setup.py install --offline || exit 1 \ No newline at end of file +$PYTHON setup.py install diff --git a/astroimtools/meta.yaml b/astroimtools/meta.yaml index 7e0cf80..9e1c029 100644 --- a/astroimtools/meta.yaml +++ b/astroimtools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'astroimtools' %} -{% 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 }} @@ -22,15 +23,15 @@ requirements: - cython - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - cython - matplotlib - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git -- cgit