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 --- stginga/bld.bat | 3 +-- stginga/build.sh | 2 +- stginga/meta.yaml | 11 +++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'stginga') diff --git a/stginga/bld.bat b/stginga/bld.bat index b290566..760380e 100644 --- a/stginga/bld.bat +++ b/stginga/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/stginga/build.sh b/stginga/build.sh index 4b71885..56f0b30 100644 --- a/stginga/build.sh +++ b/stginga/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1 \ No newline at end of file +$PYTHON setup.py install \ No newline at end of file diff --git a/stginga/meta.yaml b/stginga/meta.yaml index 4f913ac..9bfcd0d 100644 --- a/stginga/meta.yaml +++ b/stginga/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'stginga' %} {% set version = '0.2.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,16 +22,16 @@ requirements: build: - ginga >=2.6.2 - astropy >=1.2 - - numpy + - numpy {{ numpy }} - scipy - setuptools - - python x.x + - python {{ python }} run: - ginga >=2.6.2 - astropy >=1.2 - numpy - scipy - - python x.x + - python source: git_tag: {{ tag }} -- cgit