From 000f9fe943522e54fcfd0910711bfdbde8785e3b Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 14 Feb 2018 16:04:22 -0500 Subject: Next (#292) * Strip x.x selectors * Assign build-time python lock * Minimal build matrix * Numpy locking * Force -m64 on darwin * ds9: add md5 hash * stsci: Remove build section * Replace python calls with env variable; Strip redundant exit conditions * Remove dead packages * sextractor: Use Intel MKL * Use autotools whatever the platform; Switch URL to github mirror (astromatic is too slow) * Force linkage against Intel OpenMP Signed-off-by: Joseph Hunkeler * Add version guard template * Remove dead sextractor package * Bump all build revisions * Remove recipes that exist in defaults or no longer serve a purpose * Fixup mosviz requirements * Remove purge_path usage * Remove glue* recipes (favor defaults channel) * Remove pydrizzle * Replace glueviz requirement with glue-core * Remove pytools * Remove pytools dependency * Adjust specviz requirements * pyregion moved to astropy org * Fix d2to1 dependency * Remove d2to1 pip calls * Remove deprecated stsci_sphinx_theme --- astroimtools/bld.bat | 3 +-- astroimtools/build.sh | 2 +- astroimtools/meta.yaml | 11 +++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'astroimtools') diff --git a/astroimtools/bld.bat b/astroimtools/bld.bat index c50c85a..00f8037 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 --offline diff --git a/astroimtools/build.sh b/astroimtools/build.sh index b875087..ca28bfc 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 --offline \ No newline at end of file diff --git a/astroimtools/meta.yaml b/astroimtools/meta.yaml index 520d4d7..a3355c5 100644 --- a/astroimtools/meta.yaml +++ b/astroimtools/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'astroimtools' %} {% set version = '0.1.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,14 +24,14 @@ requirements: - cython - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - cython - matplotlib - numpy - - python x.x + - python source: git_tag: {{ tag }} -- cgit