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 --- crds/bld.bat | 3 +-- crds/build.sh | 2 +- crds/meta.yaml | 9 ++++++--- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'crds') diff --git a/crds/bld.bat b/crds/bld.bat index 5d42b68..7fba400 100644 --- a/crds/bld.bat +++ b/crds/bld.bat @@ -1,4 +1,3 @@ -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/crds/build.sh b/crds/build.sh index 762d43b..5a5aeeb 100644 --- a/crds/build.sh +++ b/crds/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/crds/meta.yaml b/crds/meta.yaml index 6e639ea..88f28b5 100644 --- a/crds/meta.yaml +++ b/crds/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'crds' %} {% set version = '7.1.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://www.stsci.edu/hst/observatory/crds/ @@ -21,13 +24,13 @@ requirements: build: - astropy >=1.1 - cfitsio - - numpy + - numpy {{ numpy }} - requests - lxml - parsley - setuptools - lockfile - - python + - python {{ python }} run: - astropy >=1.1 -- cgit