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 --- fitsblender/bld.bat | 7 +------ fitsblender/build.sh | 5 +---- fitsblender/meta.yaml | 11 +++++++---- 3 files changed, 9 insertions(+), 14 deletions(-) (limited to 'fitsblender') diff --git a/fitsblender/bld.bat b/fitsblender/bld.bat index 695f708..39b5e1f 100644 --- a/fitsblender/bld.bat +++ b/fitsblender/bld.bat @@ -1,6 +1 @@ - -pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/fitsblender/build.sh b/fitsblender/build.sh index 60e0bea..5a5aeeb 100644 --- a/fitsblender/build.sh +++ b/fitsblender/build.sh @@ -1,4 +1 @@ - -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/fitsblender/meta.yaml b/fitsblender/meta.yaml index abca6d5..485bc26 100644 --- a/fitsblender/meta.yaml +++ b/fitsblender/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'fitsblender' %} {% set version = '0.3.2' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://github.com/spacetelescope/{{ name }} @@ -21,13 +24,13 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - stsci.tools - numpy - - python x.x + - python source: git_tag: {{ version }} -- cgit