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 --- pyregion/bld.bat | 8 +------- pyregion/build.sh | 5 +---- pyregion/meta.yaml | 22 ++++++++++++++-------- 3 files changed, 16 insertions(+), 19 deletions(-) (limited to 'pyregion') diff --git a/pyregion/bld.bat b/pyregion/bld.bat index d1ddf28..39b5e1f 100644 --- a/pyregion/bld.bat +++ b/pyregion/bld.bat @@ -1,7 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 - -python setup.py install || exit 1 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/pyregion/build.sh b/pyregion/build.sh index 5e8b365..5a5aeeb 100644 --- a/pyregion/build.sh +++ b/pyregion/build.sh @@ -1,4 +1 @@ - -echo This d2to1 hack is deadly. -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/pyregion/meta.yaml b/pyregion/meta.yaml index f5451ce..5dc3949 100644 --- a/pyregion/meta.yaml +++ b/pyregion/meta.yaml @@ -1,9 +1,12 @@ {% set name = 'pyregion' %} -{% set version = '1.1.2' %} -{% set number = '1' %} +{% set version = '2.0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '0' %} about: - home: https://github.com/spacetelescope/{{ name }} + home: https://github.com/astropy/{{ name }} license: BSD summary: Python parser for ds9 region files @@ -16,20 +19,23 @@ package: requirements: build: - - d2to1 - - numpy + - astropy + - cython + - numpy {{ numpy }} - pyparsing - - python x.x + - python {{ python }} - setuptools run: + - astropy + - cython - numpy - pyparsing - setuptools - - python x.x + - python source: git_tag: {{ version }} - git_url: https://github.com/spacetelescope/{{ name }}.git + git_url: https://github.com/astropy/{{ name }}.git test: imports: -- cgit