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 --- pyds9/build.sh | 2 +- pyds9/meta.yaml | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'pyds9') diff --git a/pyds9/build.sh b/pyds9/build.sh index 762d43b..5a5aeeb 100644 --- a/pyds9/build.sh +++ b/pyds9/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/pyds9/meta.yaml b/pyds9/meta.yaml index a0c5f67..457ccc6 100644 --- a/pyds9/meta.yaml +++ b/pyds9/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyds9' %} {% set version = "1.9.0.dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/ericmandel/{{ name }} @@ -23,14 +26,14 @@ requirements: - ds9 - six - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - ds9 - six - numpy - - python x.x + - python source: git_rev: 3761d7ac151f8c8729d0fb6cdba017cadf278283 -- cgit