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 --- acstools/bld.bat | 3 +- acstools/build.sh | 2 +- acstools/meta.yaml | 11 +- appdirs/bld.bat | 3 - appdirs/build.sh | 2 - appdirs/meta.yaml | 29 ----- aprio/bld.bat | 3 +- aprio/build.sh | 2 +- aprio/meta.yaml | 9 +- asdf-standard/bld.bat | 3 +- asdf-standard/build.sh | 2 +- asdf-standard/meta.yaml | 9 +- asdf/meta.yaml | 11 +- asteval/meta.yaml | 3 + astroimtools/bld.bat | 3 +- astroimtools/build.sh | 2 +- astroimtools/meta.yaml | 11 +- astrolib.coords/bld.bat | 5 - astrolib.coords/build.sh | 4 - astrolib.coords/meta.yaml | 34 ------ astroquery/bld.bat | 2 +- astroquery/meta.yaml | 7 +- asv/bld.bat | 3 +- asv/build.sh | 2 +- asv/meta.yaml | 11 +- atlas-generic/bld.bat | 3 - atlas-generic/build.sh | 32 ------ atlas-generic/meta.yaml | 20 ---- calcos/bld.bat | 3 +- calcos/build.sh | 4 +- calcos/meta.yaml | 11 +- ccfits/meta.yaml | 5 +- cfitsio/build.sh | 2 +- cfitsio/meta.yaml | 5 +- conda_build_config.yaml | 13 +++ costools/bld.bat | 8 +- costools/build.sh | 5 +- costools/meta.yaml | 11 +- crds/bld.bat | 3 +- crds/build.sh | 2 +- crds/meta.yaml | 9 +- cubeviz/meta.yaml | 9 +- d2to1/bld.bat | 3 - d2to1/build.sh | 2 - d2to1/meta.yaml | 29 ----- dbus-glib/meta.yaml | 5 +- dbus-python/meta.yaml | 7 +- drizzle/bld.bat | 2 +- drizzle/build.sh | 2 +- drizzle/meta.yaml | 11 +- drizzlepac/bld.bat | 8 +- drizzlepac/build.sh | 5 +- drizzlepac/meta.yaml | 11 +- ds9/bld.bat | 1 - ds9/meta.yaml | 6 +- ext_shmht/bld.bat | 3 - ext_shmht/build.sh | 2 - ext_shmht/meta.yaml | 30 ------ fftw/build.sh | 6 +- fftw/meta.yaml | 5 +- fitsblender/bld.bat | 7 +- fitsblender/build.sh | 5 +- fitsblender/meta.yaml | 11 +- fitsverify/meta.yaml | 5 +- ginga/bld.bat | 3 +- ginga/build.sh | 2 +- ginga/meta.yaml | 13 ++- glue-core/LICENSE | 13 --- glue-core/meta.yaml | 77 ------------- glue-ginga/bld.bat | 2 - glue-ginga/build.sh | 2 - glue-ginga/meta.yaml | 40 ------- glue-vispy-viewers/LICENSE | 13 --- glue-vispy-viewers/meta.yaml | 45 -------- glueviz/LICENSE | 13 --- glueviz/logo.png | Bin 10229 -> 0 bytes glueviz/meta.yaml | 37 ------- gwcs/bld.bat | 3 +- gwcs/build.sh | 2 +- gwcs/meta.yaml | 11 +- hstcal/build.sh | 5 +- hstcal/meta.yaml | 5 +- htc_utils/bld.bat | 3 +- htc_utils/build.sh | 2 +- htc_utils/meta.yaml | 9 +- imexam/bld.bat | 2 +- imexam/meta.yaml | 11 +- iraf/bld.bat | 3 - iraf/build.sh | 198 ---------------------------------- iraf/meta.yaml | 23 ---- jwst_coronagraph_visibility/meta.yaml | 11 +- jwst_footprints/meta.yaml | 11 +- jwst_gtvt/meta.yaml | 11 +- jwxml/bld.bat | 3 +- jwxml/build.sh | 2 +- jwxml/meta.yaml | 11 +- lapack/bld.bat | 7 -- lapack/build.sh | 13 --- lapack/meta.yaml | 27 ----- linecache2/bld.bat | 3 - linecache2/build.sh | 3 - linecache2/meta.yaml | 31 ------ mechanize/bld.bat | 3 - mechanize/build.sh | 2 - mechanize/meta.yaml | 32 ------ mosviz/build.sh | 4 - mosviz/meta.yaml | 21 ++-- nictools/bld.bat | 3 +- nictools/build.sh | 4 +- nictools/meta.yaml | 11 +- opuscoords/bld.bat | 4 - opuscoords/build.sh | 2 - opuscoords/meta.yaml | 34 ------ pandokia/bld.bat | 3 +- pandokia/build.sh | 2 +- pandokia/meta.yaml | 9 +- parsley/bld.bat | 3 +- parsley/build.sh | 2 +- parsley/meta.yaml | 9 +- photutils/bld.bat | 3 +- photutils/build.sh | 2 +- photutils/meta.yaml | 9 +- poppy/bld.bat | 3 +- poppy/build.sh | 2 +- poppy/meta.yaml | 11 +- purge_path/bld.bat | 3 - purge_path/build.sh | 2 - purge_path/meta.yaml | 26 ----- py-expression-eval/meta.yaml | 7 +- pydrizzle/bld.bat | 5 - pydrizzle/build.sh | 2 - pydrizzle/meta.yaml | 39 ------- pyds9/build.sh | 2 +- pyds9/meta.yaml | 11 +- pyfftw/bld.bat | 3 +- pyfftw/build.sh | 2 +- pyfftw/meta.yaml | 11 +- pyobjc-core/bld.bat | 3 +- pyobjc-core/build.sh | 2 +- pyobjc-core/meta.yaml | 9 +- pyobjc-framework-cocoa/build.sh | 2 +- pyobjc-framework-cocoa/meta.yaml | 9 +- pyobjc-framework-quartz/build.sh | 2 +- pyobjc-framework-quartz/meta.yaml | 9 +- pyqtgraph/bld.bat | 3 - pyqtgraph/build.sh | 2 - pyqtgraph/meta.yaml | 36 ------- pyraf/bld.bat | 4 +- pyraf/build.sh | 2 +- pyraf/meta.yaml | 11 +- pyregion/bld.bat | 8 +- pyregion/build.sh | 5 +- pyregion/meta.yaml | 22 ++-- pysynphot/bld.bat | 3 +- pysynphot/build.sh | 2 +- pysynphot/meta.yaml | 11 +- python-daemon/bld.bat | 3 - python-daemon/build.sh | 2 - python-daemon/meta.yaml | 29 ----- pytools/bld.bat | 3 - pytools/build.sh | 2 - pytools/meta.yaml | 40 ------- pywcs/bld.bat | 7 -- pywcs/build.sh | 4 - pywcs/meta.yaml | 36 ------- qtpy/LICENSE | 13 --- qtpy/meta.yaml | 37 ------- reftools/bld.bat | 3 +- reftools/build.sh | 2 +- reftools/meta.yaml | 11 +- relic/bld.bat | 3 +- relic/build.sh | 2 +- relic/meta.yaml | 9 +- secretstorage/bld.bat | 1 - secretstorage/meta.yaml | 7 +- selenium/bld.bat | 3 - selenium/build.sh | 2 - selenium/meta.yaml | 30 ------ sextractor-generic/bld.bat | 2 - sextractor-generic/build.sh | 26 ----- sextractor-generic/meta.yaml | 28 ----- sextractor/build.sh | 25 +---- sextractor/meta.yaml | 20 +++- shunit2/meta.yaml | 5 +- specutils/meta.yaml | 11 +- specviz/meta.yaml | 17 +-- spherical-geometry/bld.bat | 2 +- spherical-geometry/build.sh | 2 +- spherical-geometry/meta.yaml | 11 +- sphinx_rtd_theme/bld.bat | 3 - sphinx_rtd_theme/build.sh | 2 - sphinx_rtd_theme/meta.yaml | 34 ------ sphinxcontrib-programoutput/bld.bat | 3 +- sphinxcontrib-programoutput/build.sh | 2 +- sphinxcontrib-programoutput/meta.yaml | 9 +- stginga/bld.bat | 3 +- stginga/build.sh | 2 +- stginga/meta.yaml | 11 +- stistools/bld.bat | 8 +- stistools/build.sh | 5 +- stistools/meta.yaml | 11 +- stsci-data-analysis/meta.yaml | 5 +- stsci-hst/meta.yaml | 6 +- stsci.convolve/bld.bat | 8 +- stsci.convolve/build.sh | 5 +- stsci.convolve/meta.yaml | 11 +- stsci.distutils/bld.bat | 8 +- stsci.distutils/build.sh | 5 +- stsci.distutils/meta.yaml | 11 +- stsci.image/bld.bat | 7 +- stsci.image/build.sh | 5 +- stsci.image/meta.yaml | 11 +- stsci.imagemanip/bld.bat | 8 +- stsci.imagemanip/build.sh | 5 +- stsci.imagemanip/meta.yaml | 11 +- stsci.imagestats/bld.bat | 8 +- stsci.imagestats/build.sh | 5 +- stsci.imagestats/meta.yaml | 11 +- stsci.ndimage/bld.bat | 8 +- stsci.ndimage/build.sh | 5 +- stsci.ndimage/meta.yaml | 11 +- stsci.numdisplay/bld.bat | 8 +- stsci.numdisplay/build.sh | 5 +- stsci.numdisplay/meta.yaml | 11 +- stsci.skypac/bld.bat | 3 +- stsci.skypac/build.sh | 28 +---- stsci.skypac/meta.yaml | 12 ++- stsci.sphinxext/bld.bat | 8 +- stsci.sphinxext/build.sh | 5 +- stsci.sphinxext/meta.yaml | 9 +- stsci.stimage/bld.bat | 8 +- stsci.stimage/build.sh | 5 +- stsci.stimage/meta.yaml | 11 +- stsci.tools/bld.bat | 8 +- stsci.tools/build.sh | 5 +- stsci.tools/meta.yaml | 13 +-- stsci/meta.yaml | 23 +--- stsci_sphinx_theme/bld.bat | 1 - stsci_sphinx_theme/build.sh | 1 - stsci_sphinx_theme/meta.yaml | 35 ------ stsynphot/bld.bat | 3 +- stsynphot/build.sh | 2 +- stsynphot/meta.yaml | 11 +- stwcs/bld.bat | 3 +- stwcs/meta.yaml | 5 +- synphot/bld.bat | 3 +- synphot/build.sh | 2 +- synphot/meta.yaml | 11 +- template/meta.yaml | 9 +- threading2/bld.bat | 3 - threading2/build.sh | 2 - threading2/meta.yaml | 31 ------ traceback2/bld.bat | 3 - traceback2/build.sh | 2 - traceback2/meta.yaml | 37 ------- verhawk/bld.bat | 3 +- verhawk/build.sh | 2 +- verhawk/meta.yaml | 9 +- wcstools/meta.yaml | 5 +- webbpsf-data/meta.yaml | 5 +- webbpsf/bld.bat | 3 +- webbpsf/build.sh | 2 +- webbpsf/meta.yaml | 11 +- wfc3tools/bld.bat | 3 +- wfc3tools/build.sh | 2 +- wfc3tools/meta.yaml | 11 +- wfpc2tools/bld.bat | 7 +- wfpc2tools/build.sh | 30 +----- wfpc2tools/meta.yaml | 11 +- ws4py/bld.bat | 3 - ws4py/build.sh | 2 - ws4py/meta.yaml | 31 ------ xpa/meta.yaml | 7 +- yolk/bld.bat | 3 - yolk/build.sh | 2 - yolk/meta.yaml | 31 ------ 276 files changed, 657 insertions(+), 2090 deletions(-) delete mode 100644 appdirs/bld.bat delete mode 100644 appdirs/build.sh delete mode 100644 appdirs/meta.yaml delete mode 100644 astrolib.coords/bld.bat delete mode 100644 astrolib.coords/build.sh delete mode 100644 astrolib.coords/meta.yaml delete mode 100644 atlas-generic/bld.bat delete mode 100644 atlas-generic/build.sh delete mode 100644 atlas-generic/meta.yaml create mode 100644 conda_build_config.yaml delete mode 100644 d2to1/bld.bat delete mode 100644 d2to1/build.sh delete mode 100644 d2to1/meta.yaml delete mode 100644 ext_shmht/bld.bat delete mode 100644 ext_shmht/build.sh delete mode 100644 ext_shmht/meta.yaml delete mode 100644 glue-core/LICENSE delete mode 100644 glue-core/meta.yaml delete mode 100644 glue-ginga/bld.bat delete mode 100644 glue-ginga/build.sh delete mode 100644 glue-ginga/meta.yaml delete mode 100644 glue-vispy-viewers/LICENSE delete mode 100644 glue-vispy-viewers/meta.yaml delete mode 100644 glueviz/LICENSE delete mode 100644 glueviz/logo.png delete mode 100644 glueviz/meta.yaml delete mode 100644 iraf/bld.bat delete mode 100644 iraf/build.sh delete mode 100644 iraf/meta.yaml delete mode 100644 lapack/bld.bat delete mode 100644 lapack/build.sh delete mode 100644 lapack/meta.yaml delete mode 100644 linecache2/bld.bat delete mode 100644 linecache2/build.sh delete mode 100644 linecache2/meta.yaml delete mode 100644 mechanize/bld.bat delete mode 100644 mechanize/build.sh delete mode 100644 mechanize/meta.yaml delete mode 100644 opuscoords/bld.bat delete mode 100644 opuscoords/build.sh delete mode 100644 opuscoords/meta.yaml delete mode 100644 purge_path/bld.bat delete mode 100644 purge_path/build.sh delete mode 100644 purge_path/meta.yaml delete mode 100644 pydrizzle/bld.bat delete mode 100644 pydrizzle/build.sh delete mode 100644 pydrizzle/meta.yaml delete mode 100644 pyqtgraph/bld.bat delete mode 100644 pyqtgraph/build.sh delete mode 100644 pyqtgraph/meta.yaml delete mode 100644 python-daemon/bld.bat delete mode 100644 python-daemon/build.sh delete mode 100644 python-daemon/meta.yaml delete mode 100644 pytools/bld.bat delete mode 100644 pytools/build.sh delete mode 100644 pytools/meta.yaml delete mode 100644 pywcs/bld.bat delete mode 100644 pywcs/build.sh delete mode 100644 pywcs/meta.yaml delete mode 100644 qtpy/LICENSE delete mode 100644 qtpy/meta.yaml delete mode 100644 selenium/bld.bat delete mode 100644 selenium/build.sh delete mode 100644 selenium/meta.yaml delete mode 100644 sextractor-generic/bld.bat delete mode 100644 sextractor-generic/build.sh delete mode 100644 sextractor-generic/meta.yaml delete mode 100644 sphinx_rtd_theme/bld.bat delete mode 100644 sphinx_rtd_theme/build.sh delete mode 100644 sphinx_rtd_theme/meta.yaml delete mode 100644 stsci_sphinx_theme/bld.bat delete mode 100644 stsci_sphinx_theme/build.sh delete mode 100644 stsci_sphinx_theme/meta.yaml delete mode 100644 threading2/bld.bat delete mode 100644 threading2/build.sh delete mode 100644 threading2/meta.yaml delete mode 100644 traceback2/bld.bat delete mode 100644 traceback2/build.sh delete mode 100644 traceback2/meta.yaml delete mode 100644 ws4py/bld.bat delete mode 100644 ws4py/build.sh delete mode 100644 ws4py/meta.yaml delete mode 100644 yolk/bld.bat delete mode 100644 yolk/build.sh delete mode 100644 yolk/meta.yaml diff --git a/acstools/bld.bat b/acstools/bld.bat index 98bf5c5..39b5e1f 100644 --- a/acstools/bld.bat +++ b/acstools/bld.bat @@ -1,2 +1 @@ -python setup.py install || exit 1 -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/acstools/build.sh b/acstools/build.sh index 5c61be1..5a5aeeb 100644 --- a/acstools/build.sh +++ b/acstools/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/acstools/meta.yaml b/acstools/meta.yaml index 7bfd78e..ff6fd11 100644 --- a/acstools/meta.yaml +++ b/acstools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'acstools' %} {% set version = '2.0.9' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -15,16 +18,16 @@ requirements: build: - astropy >=1.1 - stsci.tools - - numpy + - numpy {{ numpy }} - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.1 - scikit-image - stsci.tools - matplotlib - numpy - - python x.x + - python source: git_tag: {{ version }} git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/appdirs/bld.bat b/appdirs/bld.bat deleted file mode 100644 index b290566..0000000 --- a/appdirs/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/appdirs/build.sh b/appdirs/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/appdirs/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/appdirs/meta.yaml b/appdirs/meta.yaml deleted file mode 100644 index 907be5f..0000000 --- a/appdirs/meta.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{% set name = 'appdirs' %} -{% set version = '1.4.0' %} -{% set number = '0' %} - -about: - home: http://github.com/ActiveState/{{ name }} - license: MIT - summary: | - A small Python module for determining appropriate platform-specific dirs - e.g. a "user data dir". - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 1d17b4c9694ab84794e228f28dc3275b - url: https://pypi.python.org/packages/source/a/{{ name }}/{{ name }}-{{ version }}.tar.gz diff --git a/aprio/bld.bat b/aprio/bld.bat index b290566..760380e 100644 --- a/aprio/bld.bat +++ b/aprio/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/aprio/build.sh b/aprio/build.sh index 4b71885..56f0b30 100644 --- a/aprio/build.sh +++ b/aprio/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/aprio/meta.yaml b/aprio/meta.yaml index 1477c77..3adcd47 100644 --- a/aprio/meta.yaml +++ b/aprio/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'aprio' %} {% set version = '1.0.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://bitbucket.org/jhunkeler/{{ name }} @@ -17,7 +20,7 @@ package: requirements: build: - - python x.x + - python {{ python }} - setuptools - psutil - python-daemon @@ -26,7 +29,7 @@ requirements: - psutil - python-daemon - docutils - - python x.x + - python source: git_tag: {{ tag }} diff --git a/asdf-standard/bld.bat b/asdf-standard/bld.bat index b290566..760380e 100644 --- a/asdf-standard/bld.bat +++ b/asdf-standard/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/asdf-standard/build.sh b/asdf-standard/build.sh index 4b71885..56f0b30 100644 --- a/asdf-standard/build.sh +++ b/asdf-standard/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/asdf-standard/meta.yaml b/asdf-standard/meta.yaml index cffd172..b1c3165 100644 --- a/asdf-standard/meta.yaml +++ b/asdf-standard/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'asdf-standard' %} {% set version = '1.0.0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,12 +26,12 @@ requirements: - mistune - six [py27|py3k] - setuptools - - python x.x + - python {{ python }} run: - nose - astropy >=1.1 - setuptools - - python x.x + - python source: git_tag: {{ tag }} diff --git a/asdf/meta.yaml b/asdf/meta.yaml index cb10ab1..d1eb588 100644 --- a/asdf/meta.yaml +++ b/asdf/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'asdf' %} {% set version = '1.3.1' %} -{% set number = '2' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '3' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,8 +26,8 @@ requirements: - pytest - six - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - semantic_version >=2.3.1 - astropy >=1.3 @@ -34,7 +37,7 @@ requirements: - six - setuptools - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/asteval/meta.yaml b/asteval/meta.yaml index b387816..d2aa3a2 100644 --- a/asteval/meta.yaml +++ b/asteval/meta.yaml @@ -1,5 +1,8 @@ {% set name = "asteval" %} {% set version = "0.9.11" %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set file_ext = "tar.gz" %} {% set hash_type = "sha256" %} {% set hash_value = "5995f1863c1685cd00df010663c15be880035a38b1e58c6340fb1d3adc499d8e" %} diff --git a/astroimtools/bld.bat b/astroimtools/bld.bat index c50c85a..00f8037 100644 --- a/astroimtools/bld.bat +++ b/astroimtools/bld.bat @@ -1,3 +1,2 @@ -python setup.py install --offline -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install --offline diff --git a/astroimtools/build.sh b/astroimtools/build.sh index b875087..ca28bfc 100644 --- a/astroimtools/build.sh +++ b/astroimtools/build.sh @@ -1,2 +1,2 @@ -python setup.py install --offline || exit 1 \ No newline at end of file +$PYTHON setup.py install --offline \ No newline at end of file diff --git a/astroimtools/meta.yaml b/astroimtools/meta.yaml index 520d4d7..a3355c5 100644 --- a/astroimtools/meta.yaml +++ b/astroimtools/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'astroimtools' %} {% set version = '0.1.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,14 +24,14 @@ requirements: - cython - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - cython - matplotlib - numpy - - python x.x + - python source: git_tag: {{ tag }} diff --git a/astrolib.coords/bld.bat b/astrolib.coords/bld.bat deleted file mode 100644 index fe97c61..0000000 --- a/astrolib.coords/bld.bat +++ /dev/null @@ -1,5 +0,0 @@ - - -pip install --no-deps --upgrade --force d2to1 || exit 1 -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/astrolib.coords/build.sh b/astrolib.coords/build.sh deleted file mode 100644 index 5d1e7ae..0000000 --- a/astrolib.coords/build.sh +++ /dev/null @@ -1,4 +0,0 @@ - -pip install --no-deps --upgrade --force d2to1 || exit 1 -test -f README.md && ln -s README.md README.txt -python setup.py install || exit 1 \ No newline at end of file diff --git a/astrolib.coords/meta.yaml b/astrolib.coords/meta.yaml deleted file mode 100644 index abb2c81..0000000 --- a/astrolib.coords/meta.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{% set name = 'astrolib.coords' %} -{% set version = '0.39.6' %} -{% set number = '1' %} - -about: - home: https://github.com/spacetelescope/{{ name }} - license: BSD - summary: Astronomical coordinates & angular separations - -package: - name: {{ name }} - version: {{ version }} - -build: - number: {{ number }} - -requirements: - build: - - d2to1 - - stsci.distutils - - setuptools - - numpy - - python x.x - run: - - numpy - - python x.x - -source: - git_tag: {{ version }} - git_url: https://github.com/spacetelescope/{{ name }}.git - -test: - imports: - - astrolib.coords diff --git a/astroquery/bld.bat b/astroquery/bld.bat index 762d43b..39b5e1f 100644 --- a/astroquery/bld.bat +++ b/astroquery/bld.bat @@ -1 +1 @@ -python setup.py install +%PYTHON% setup.py install diff --git a/astroquery/meta.yaml b/astroquery/meta.yaml index 59f7a64..0f10d5f 100644 --- a/astroquery/meta.yaml +++ b/astroquery/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'astroquery' %} {% set version = '0.3.7' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/astropy/{{ name }} @@ -28,7 +31,7 @@ requirements: - html5lib - secretstorage [linux] - setuptools - - python + - python {{ python }} run: - astropy diff --git a/asv/bld.bat b/asv/bld.bat index b290566..760380e 100644 --- a/asv/bld.bat +++ b/asv/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/asv/build.sh b/asv/build.sh index fc8c75d..5033d2f 100644 --- a/asv/build.sh +++ b/asv/build.sh @@ -1,3 +1,3 @@ pip install --force sphinx_bootstrap_theme -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/asv/meta.yaml b/asv/meta.yaml index deda973..9c974be 100644 --- a/asv/meta.yaml +++ b/asv/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'asv' %} {% set version = '0.1.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,13 +24,13 @@ requirements: - six - sphinx - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - six - sphinx - numpy - - python x.x + - python source: git_tag: {{ tag }} diff --git a/atlas-generic/bld.bat b/atlas-generic/bld.bat deleted file mode 100644 index bea6315..0000000 --- a/atlas-generic/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -echo Not supported -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/atlas-generic/build.sh b/atlas-generic/build.sh deleted file mode 100644 index f962f6a..0000000 --- a/atlas-generic/build.sh +++ /dev/null @@ -1,32 +0,0 @@ -export LIBTOOL=/usr/bin/libtool -export OPTIONS= - -case "$(uname -s)" in - Darwin) - export CC=/opt/local/bin/gcc-mp-4.8 - export F77=/opt/local/bin/gfortran-mp-4.8 - ;; - Linux) - export CC=/usr/bin/gcc - export F77=/usr/bin/gfortran - ;; - *) - ;; -esac - -export OPTIONS="-Fa alg -fPIC -C agc $CC -C if $F77 --shared -t 2 -b 64 -V 128 -A 12" -export LAPACK_VERSION=3.5.0 -export LAPACK_TARBALL=lapack-${LAPACK_VERSION}.tgz -export LAPACK_URL="http://www.netlib.org/lapack/${LAPACK_TARBALL}" -wget ${LAPACK_URL} - -mkdir -p build -pushd ./build -../configure --prefix=$PREFIX \ - --with-netlib-lapack-tarfile=../${LAPACK_TARBALL} \ - ${OPTIONS} - -make LIBTOOL=$LIBTOOL CC=$CC F77=$F77 -make install - -popd diff --git a/atlas-generic/meta.yaml b/atlas-generic/meta.yaml deleted file mode 100644 index 12956c2..0000000 --- a/atlas-generic/meta.yaml +++ /dev/null @@ -1,20 +0,0 @@ -{% set name = 'atlas-generic' %} -{% set version = '3.10.2' %} -{% set number = '0' %} - -about: - home: http://sourceforge.net/projects/math-atlas/files/Stable - license: BSD - summary: Automatically Tuned Linear Algebra Software - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -source: - fn: atlas3.10.2.tar.bz2 - url: - - http://sourceforge.net/projects/math-atlas/files/Stable/3.10.2/atlas3.10.2.tar.bz2 diff --git a/calcos/bld.bat b/calcos/bld.bat index 5d42b68..7fba400 100644 --- a/calcos/bld.bat +++ b/calcos/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/calcos/build.sh b/calcos/build.sh index 52582b9..b442f84 100644 --- a/calcos/build.sh +++ b/calcos/build.sh @@ -1,4 +1,2 @@ - -pip install --no-deps --upgrade --force d2to1 sed -i -e 's|pyfits.*|astropy (>=0.3.1)|' setup.cfg -python setup.py install || exit 1 \ No newline at end of file +$PYTHON setup.py install diff --git a/calcos/meta.yaml b/calcos/meta.yaml index 8e139e0..1243415 100644 --- a/calcos/meta.yaml +++ b/calcos/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'calcos' %} {% set version = '3.2.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,14 +24,14 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - scipy - stsci.tools - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/ccfits/meta.yaml b/ccfits/meta.yaml index e55dc90..e468fa1 100644 --- a/ccfits/meta.yaml +++ b/ccfits/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'ccfits' %} {% set badname = 'CCfits' %} {% set version = '2.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: diff --git a/cfitsio/build.sh b/cfitsio/build.sh index 0a523d1..6ceb369 100644 --- a/cfitsio/build.sh +++ b/cfitsio/build.sh @@ -1,3 +1,3 @@ ./configure --prefix=$PREFIX --disable-static --enable-reentrant -(make -j $CPU_COUNT shared && make install) || exit 1 \ No newline at end of file +(make -j $CPU_COUNT shared && make install) \ No newline at end of file diff --git a/cfitsio/meta.yaml b/cfitsio/meta.yaml index 6dbd161..bc627ae 100644 --- a/cfitsio/meta.yaml +++ b/cfitsio/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'cfitsio' %} {% set version = '3.370' %} {% set version_short = '3370' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html diff --git a/conda_build_config.yaml b/conda_build_config.yaml new file mode 100644 index 0000000..e890122 --- /dev/null +++ b/conda_build_config.yaml @@ -0,0 +1,13 @@ +python: + - 3.5 + - 3.6 + +numpy: + - 1.12 + +pin_build_as_run: + python: + max_pin: x.x + + numpy: + max_pin: x.x diff --git a/costools/bld.bat b/costools/bld.bat index d1ddf28..39b5e1f 100644 --- a/costools/bld.bat +++ b/costools/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/costools/build.sh b/costools/build.sh index 5e8b365..5a5aeeb 100644 --- a/costools/build.sh +++ b/costools/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/costools/meta.yaml b/costools/meta.yaml index 1d8b182..c6e0715 100644 --- a/costools/meta.yaml +++ b/costools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'costools' %} {% set version = '1.2.1' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,15 +25,15 @@ requirements: - calcos - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - calcos - stsci.tools - setuptools - numpy - - python x.x + - python source: git_tag: {{ version }} 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 diff --git a/cubeviz/meta.yaml b/cubeviz/meta.yaml index b2a18e3..2f716b6 100644 --- a/cubeviz/meta.yaml +++ b/cubeviz/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'cubeviz' %} {% set version = '0.0.2' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,7 +22,7 @@ requirements: - asdf - asteval - astropy - - glueviz + - glue-core >=0.12.0 - numpy {{ numpy }} - pytest - setuptools @@ -29,7 +32,7 @@ requirements: - asdf - asteval - astropy - - glueviz + - glue-core >=0.12.0 - numpy - pytest - python diff --git a/d2to1/bld.bat b/d2to1/bld.bat deleted file mode 100644 index b290566..0000000 --- a/d2to1/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/d2to1/build.sh b/d2to1/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/d2to1/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/d2to1/meta.yaml b/d2to1/meta.yaml deleted file mode 100644 index aa148fa..0000000 --- a/d2to1/meta.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{% set name = 'd2to1' %} -{% set version = '0.2.12' %} -{% set number = '0' %} - -about: - home: https://github.com/embray/{{ name }} - license: BSD - summary: | - Allows using distutils2-like setup.cfg files for package metadata - with a distribute/setuptools setup.py - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - setuptools - - python x.x - -source: - git_tag: {{ version }} - git_url: https://github.com/embray/{{ name }}.git diff --git a/dbus-glib/meta.yaml b/dbus-glib/meta.yaml index 780ca3d..4251b52 100644 --- a/dbus-glib/meta.yaml +++ b/dbus-glib/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'dbus-glib' %} {% set version = '0.108' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} {% set archive = name + '-' + version + '.tar.gz' %} package: diff --git a/dbus-python/meta.yaml b/dbus-python/meta.yaml index 8e2b78d..65eac2c 100644 --- a/dbus-python/meta.yaml +++ b/dbus-python/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'dbus-python' %} {% set version = '1.2.4' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} {% set archive = name + '-' + version + '.tar.gz' %} about: @@ -27,7 +30,7 @@ requirements: - dbus - dbus-glib - setuptools - - python + - python {{ python }} run: - dbus diff --git a/drizzle/bld.bat b/drizzle/bld.bat index 762d43b..39b5e1f 100644 --- a/drizzle/bld.bat +++ b/drizzle/bld.bat @@ -1 +1 @@ -python setup.py install +%PYTHON% setup.py install diff --git a/drizzle/build.sh b/drizzle/build.sh index 762d43b..5a5aeeb 100644 --- a/drizzle/build.sh +++ b/drizzle/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/drizzle/meta.yaml b/drizzle/meta.yaml index 431caaf..316ebe6 100644 --- a/drizzle/meta.yaml +++ b/drizzle/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'drizzle' %} {% set version = '1.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,13 +25,13 @@ requirements: build: - astropy >=1.1 - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - numpy - - python x.x + - python test: imports: diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat index d1ddf28..39b5e1f 100644 --- a/drizzlepac/bld.bat +++ b/drizzlepac/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/drizzlepac/build.sh b/drizzlepac/build.sh index 3bc9ae7..5a5aeeb 100644 --- a/drizzlepac/build.sh +++ b/drizzlepac/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 +$PYTHON setup.py install diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml index 78e3347..15b0800 100644 --- a/drizzlepac/meta.yaml +++ b/drizzlepac/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'drizzlepac' %} {% set version = '2.1.21' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,7 +22,7 @@ requirements: - astropy >=1.1 - fitsblender - nictools - - numpy + - numpy {{ numpy }} - scipy - stsci.convolve - stsci.distutils @@ -33,7 +36,7 @@ requirements: - stsci.tools - stwcs - pyregion - - python x.x + - python {{ python }} - setuptools run: - astropy >=1.1 @@ -53,7 +56,7 @@ requirements: - stwcs - pyregion - setuptools - - python x.x + - python source: git_tag: {{ version }} diff --git a/ds9/bld.bat b/ds9/bld.bat index 158ac2f..6de3f4a 100644 --- a/ds9/bld.bat +++ b/ds9/bld.bat @@ -1,3 +1,2 @@ exit 1 -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/ds9/meta.yaml b/ds9/meta.yaml index d5dacdd..6d01f38 100644 --- a/ds9/meta.yaml +++ b/ds9/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'ds9' %} {% set version = '7.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://ds9.si.edu/download/source/ @@ -22,3 +25,4 @@ requirements: source: fn: {{ name }}.{{ version }}.tar.gz url: http://ds9.si.edu/download/source/{{ name }}.{{ version }}.tar.gz + md5: 5684be5f6123f3d0426ea3db46466cb4 diff --git a/ext_shmht/bld.bat b/ext_shmht/bld.bat deleted file mode 100644 index b290566..0000000 --- a/ext_shmht/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/ext_shmht/build.sh b/ext_shmht/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/ext_shmht/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/ext_shmht/meta.yaml b/ext_shmht/meta.yaml deleted file mode 100644 index 07ae0b8..0000000 --- a/ext_shmht/meta.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{% set name = 'ext_shmht' %} -{% set version = '0.1' %} -{% set number = '0' %} - -about: - home: https://github.com/stsci-ssb/{{ name }} - license: BSD - summary: Shared memory extension - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - six - - python x.x - -source: - git_url: https://github.com/stsci-ssb/{{ name }}.git - -test: - imports: - - ext_shmht diff --git a/fftw/build.sh b/fftw/build.sh index 3cad563..e52d574 100644 --- a/fftw/build.sh +++ b/fftw/build.sh @@ -4,9 +4,9 @@ export FFTW_CONFIGURE="./configure --prefix=$PREFIX --disable-static --enable-sh function fftw_build { -$FFTW_CONFIGURE "$@" || exit 1 -make -j$CPU_COUNT || exit 1 -make install || exit 1 +$FFTW_CONFIGURE "$@" +make -j$CPU_COUNT +make install } fftw_build diff --git a/fftw/meta.yaml b/fftw/meta.yaml index 4a614ad..537d2c4 100644 --- a/fftw/meta.yaml +++ b/fftw/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'fftw' %} {% set version = '3.3.4' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://www.fftw.org 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 }} diff --git a/fitsverify/meta.yaml b/fitsverify/meta.yaml index b4cd992..007b46d 100644 --- a/fitsverify/meta.yaml +++ b/fitsverify/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'fitsverify' %} {% set version = '4.18' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html diff --git a/ginga/bld.bat b/ginga/bld.bat index b290566..760380e 100644 --- a/ginga/bld.bat +++ b/ginga/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/ginga/build.sh b/ginga/build.sh index d0bc088..e8d6a8f 100644 --- a/ginga/build.sh +++ b/ginga/build.sh @@ -1,3 +1,3 @@ echo > README.txt -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/ginga/meta.yaml b/ginga/meta.yaml index 79fb1ba..e598f09 100644 --- a/ginga/meta.yaml +++ b/ginga/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'ginga' %} {% set version = '2.6.6' %} -{% set tag = 'v2.6.6' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set tag = 'v' ~ version %} +{% set number = '1' %} about: home: https://github.com/ejeschke/{{ name }} @@ -21,14 +24,14 @@ requirements: - qtpy - pillow - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.2 - qtpy - pillow - numpy - - python x.x + - python source: git_tag: {{ tag }} diff --git a/glue-core/LICENSE b/glue-core/LICENSE deleted file mode 100644 index 04ad21b..0000000 --- a/glue-core/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -BSD 3-clause license -Copyright (c) conda-forge -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/glue-core/meta.yaml b/glue-core/meta.yaml deleted file mode 100644 index 87c787d..0000000 --- a/glue-core/meta.yaml +++ /dev/null @@ -1,77 +0,0 @@ -{% set name = 'glue-core' %} -{% set version = '0.12.0' %} -{% set number = '0' %} - -package: - name: {{ name }} - version: {{ version }} - -source: - fn: {{ name }}-{{ version }}.tar.gz - url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: db871285e9fe4ff0092d6803d573daa953ec9864b9128cd027cee97b2573e557 - -build: - number: {{ number }} - script: python setup.py install --single-version-externally-managed --record record.txt - entry_points: - - glue = glue.main:main - - glue-config = glue.config_gen:main - - glue-deps = glue._deps:main - osx_is_app: True - -requirements: - - build: - - python - - setuptools - - pyqt - - run: - - # The following is needed to make sure that the package works as a GUI - # application (glue needs to be run with python.app, not python) - - python.app # [osx] - - # Required dependencies - - python - - numpy >=1.9 - - pandas >=0.14 - - astropy >=1.3 - - matplotlib >=1.4 - - qtpy >=1.2 - - ipython >=4.0 - - ipykernel - - qtconsole - - dill >=0.2 - - xlrd >=1.0 - - h5py >=2.4 - - setuptools >=1.0 - - pyqt - - # Optional dependencies (defined in ``extras_require``) - - scipy - - scikit-image - - plotly - - # Temporary: the scikit-image conda package is missing the dask dependency - # so we add it here for now - - dask - -test: - imports: - - glue - - glue.core - - glue.app.qt - commands: - - glue --version - - glue-deps list - -# NOTE: we deliberatey do NOT include an app entry here, because we instead do this -# in the glueviz meta-package (we don't want glue to appear twice in the navigator) - -about: - home: http://glueviz.org - license: BSD 3-Clause - license_file: LICENSE - summary: Multi-dimensional linked data exploration diff --git a/glue-ginga/bld.bat b/glue-ginga/bld.bat deleted file mode 100644 index 85a7bc3..0000000 --- a/glue-ginga/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -%PYTHON% setup.py install -if errorlevel 1 exit 1 diff --git a/glue-ginga/build.sh b/glue-ginga/build.sh deleted file mode 100644 index 2038de1..0000000 --- a/glue-ginga/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -echo > README.rst -$PYTHON setup.py install || exit 1 diff --git a/glue-ginga/meta.yaml b/glue-ginga/meta.yaml deleted file mode 100644 index de1d000..0000000 --- a/glue-ginga/meta.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{% set name = 'glue-ginga' %} -{% set version = '0.2' %} -{% set tag = 'v' + version %} -{% set number = '0' %} - -about: - home: https://github.com/ejeschke/{{ name }} - license: BSD - summary: Astronomical data visualization - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - astropy >=1.2 - - glue-core >=0.11.1 - - glue-vispy-viewers >=0.8 - - ginga >=2.6.1 - - setuptools - - numpy - - python x.x - run: - - astropy >=1.2 - - glueviz >=0.10 - - ginga >=2.6.1 - - numpy - - python x.x - -source: - git_tag: {{ tag }} - git_url: https://github.com/ejeschke/{{ name }}.git - -test: - imports: - - glue_ginga diff --git a/glue-vispy-viewers/LICENSE b/glue-vispy-viewers/LICENSE deleted file mode 100644 index 04ad21b..0000000 --- a/glue-vispy-viewers/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -BSD 3-clause license -Copyright (c) conda-forge -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/glue-vispy-viewers/meta.yaml b/glue-vispy-viewers/meta.yaml deleted file mode 100644 index 2a61fa4..0000000 --- a/glue-vispy-viewers/meta.yaml +++ /dev/null @@ -1,45 +0,0 @@ -{% set name = 'glue-vispy-viewers' %} -{% set version = "0.9" %} -{% set number = '0' %} - -package: - name: {{ name }} - version: {{ version }} - -source: - fn: {{ name }}-{{ version }}.tar.gz - url: https://pypi.io/packages/source/g/glue-vispy-viewers/{{ name }}-{{ version }}.tar.gz - sha256: 8af81e184fc2ed43421f5be4affb88b9c190dd6c5ef14317821bd6b921c591d3 - -build: - number: {{ number }} - script: python setup.py install --single-version-externally-managed --record record.txt - preserve_egg_dir: True - -requirements: - build: - - python - - setuptools - - numpy - - pyopengl - - glue-core >=0.12 - - run: - - python - - numpy - - pyopengl - - glue-core >=0.12 - - matplotlib - - qtpy - - pyqt - -test: - imports: - - glue_vispy_viewers - - glue_vispy_viewers.scatter - - glue_vispy_viewers.volume - -about: - home: https://github.com/glue-viz/glue-vispy-viewers - license: BSD 3-Clause - summary: 3D viewers for Glue diff --git a/glueviz/LICENSE b/glueviz/LICENSE deleted file mode 100644 index 04ad21b..0000000 --- a/glueviz/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -BSD 3-clause license -Copyright (c) conda-forge -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/glueviz/logo.png b/glueviz/logo.png deleted file mode 100644 index b2e7206..0000000 Binary files a/glueviz/logo.png and /dev/null differ diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml deleted file mode 100644 index 6657d4a..0000000 --- a/glueviz/meta.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# NOTE: this is a meta-package that includes the core glue code as well as stable -# plugins. This is the main conda package we want in the Navigator, so we add the -# app: entry here and not in the glue-core package. - -{% set name = 'glueviz' %} -{% set version = '0.12.0' %} -{% set number = '0' %} - -package: - name: {{ name }} - version: {{ version }} - -source: - fn: {{ name }}-{{ version }}.tar.gz - url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 4b41b9bb41d88567e9fef76af545059ba9bb6c3a3645a07619fa5b1b47adbc5e - -build: - number: {{ number }} - script: python setup.py install --single-version-externally-managed --record record.txt - -requirements: - run: - - glue-core >=0.12 - - glue-vispy-viewers >=0.9 - - glue-ginga - -app: - entry: glue - icon: logo.png - summary: Multi-dimensional linked data exploration - type: desk - -about: - home: http://glueviz.org - license: BSD 3-Clause - summary: Multi-dimensional linked data exploration diff --git a/gwcs/bld.bat b/gwcs/bld.bat index b290566..760380e 100644 --- a/gwcs/bld.bat +++ b/gwcs/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/gwcs/build.sh b/gwcs/build.sh index 4b71885..56f0b30 100644 --- a/gwcs/build.sh +++ b/gwcs/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/gwcs/meta.yaml b/gwcs/meta.yaml index 71bc449..13d3ff2 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'gwcs' %} {% set version = '0.8.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,13 +22,13 @@ requirements: - asdf - astropy >=2.0 - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - asdf - astropy >=2.0 - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/hstcal/build.sh b/hstcal/build.sh index a10e61f..4845293 100644 --- a/hstcal/build.sh +++ b/hstcal/build.sh @@ -1,7 +1,10 @@ if [[ `uname` == Darwin ]]; then export CC=`which gcc` + export DARWIN_FLAGS='-m64' + export CFLAGS="$CFLAGS $DARWIN_FLAGS" + export LDFLAGS="$LDFLAGS $DARWIN_FLAGS" fi -./waf configure --destdir=$PREFIX +./waf configure --prefix=$PREFIX ./waf build ./waf install diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml index fc7c225..a8420cd 100644 --- a/hstcal/meta.yaml +++ b/hstcal/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'hstcal' %} {% set version = '1.3.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} diff --git a/htc_utils/bld.bat b/htc_utils/bld.bat index b290566..760380e 100644 --- a/htc_utils/bld.bat +++ b/htc_utils/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/htc_utils/build.sh b/htc_utils/build.sh index 4b71885..56f0b30 100644 --- a/htc_utils/build.sh +++ b/htc_utils/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/htc_utils/meta.yaml b/htc_utils/meta.yaml index 26d4b94..fee693c 100644 --- a/htc_utils/meta.yaml +++ b/htc_utils/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'htc_utils' %} {% set version = '0.1.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/jhunkeler/{{ name }} @@ -18,10 +21,10 @@ requirements: build: - argparse [py26] - setuptools - - python x.x + - python {{ python }} run: - argparse [py26] - - python x.x + - python source: git_tag: {{ version }} diff --git a/imexam/bld.bat b/imexam/bld.bat index 762d43b..39b5e1f 100644 --- a/imexam/bld.bat +++ b/imexam/bld.bat @@ -1 +1 @@ -python setup.py install +%PYTHON% setup.py install diff --git a/imexam/meta.yaml b/imexam/meta.yaml index f68232f..22cf742 100644 --- a/imexam/meta.yaml +++ b/imexam/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'imexam' %} {% set version = '0.8.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -25,8 +28,8 @@ requirements: - cython - pytest - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.3 - cython @@ -37,7 +40,7 @@ requirements: - matplotlib - scipy - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/iraf/bld.bat b/iraf/bld.bat deleted file mode 100644 index fa5316a..0000000 --- a/iraf/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -echo Not supported on Windows -exit 1 \ No newline at end of file diff --git a/iraf/build.sh b/iraf/build.sh deleted file mode 100644 index ce05d24..0000000 --- a/iraf/build.sh +++ /dev/null @@ -1,198 +0,0 @@ - -set -x - -export IRAFARCH='' -export target=`uname`.32 -export PLATFORM= -case "$target" in -Linux.32) -export IRAFARCH='linux' -export CFLAGS="-m32" -export LDFLAGS="-m32" -export PLATFORM='linux' -;; -Darwin.32) -export IRAFARCH='macosx' -export CFLAGS="-m32 -arch i386" -export LDFLAGS="-m32 -arch i386" -export PLATFORM='osx' -;; -*) -echo "UNSUPPORTED ARCHITECTURE (64-bit disabled, by the way...)" -exit 1 -;; -esac - - -VARIANTS=http://ssb.stsci.edu/stripped/$PLATFORM/variants.tar.gz -curl -O $VARIANTS -tar xf variants.tar.gz -C $PREFIX -rm -f variants.tar.gz - -mkdir -p $PREFIX/bin \ -$PREFIX/share/man - -for binary in $PREFIX/variants/common/bin/*.e -do -( cd $PREFIX/bin && ln -s -f $binary ) -done - -X11IRAF=http://ssb.stsci.edu/stripped/$PLATFORM/x11iraf.tar.gz -curl -O $X11IRAF -tar xf x11iraf.tar.gz -rm -f x11iraf.tar.gz - -rsync -aH x11iraf/bin/ $PREFIX/bin -rsync -aH x11iraf/man/ $PREFIX/share/man -rm -rf x11iraf - -export TERM=xterm -if [[ $PLATFORM == "osx" ]]; then -test -d /sw && export PATH=`purge_path /sw` -fi -export iraf=$PREFIX/iraf/ - -echo "Fixing c headers..." -find . -type f -name "*.h" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" - -echo "Fixing c sources..." -find . -type f -name "*.c" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" - -mkdir -p $iraf -rsync -aH `pwd`/ $iraf - -cd $iraf - -rm -rf bin_directory -rm -rf $iraf/vo/bin.generic/bin.macosx - - - -( cd $PREFIX/bin && \ -ln -s -f $iraf/unix/hlib/cl.sh cl && \ -ln -s -f $iraf/unix/hlib/mkiraf.sh mkiraf && \ -ln -s -f $iraf/unix/hlib/mkmlist.csh mkmlist && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/generic.e generic && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/mkpkg.e mkpkg && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/rmbin.e rmbin && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/rmfiles.e rmfiles && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/rpp.e rpp && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/rtar.e rtar &&\ -ln -s -f $iraf/unix/bin.$IRAFARCH/sgidispatch.e sgidispatch && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/wtar.e wtar && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/xc.e xc && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/xpp.e && \ -ln -s -f $iraf/unix/bin.$IRAFARCH/xyacc.e xyacc ) - -UR_BUILTIN=/Users/Shared/ureka.iraf/ur_work/iraf -find . -lname "$UR_BUILTIN/*" \ --exec sh -c 'echo Re-linking builtin paths "$0" ;\ -ln -snf "$(readlink "$0" \ -| sed -e "s|$UR_BUILTIN|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \; - -find . -lname '/iraf/iraf/*' \ --exec sh -c 'echo Re-linking "$0" ;\ -ln -snf "$(readlink "$0" \ -| sed -e "s|/iraf/iraf|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \; - - -echo "Removing dead symlinks..." -find $iraf $iraf/../variants -type l | xargs -n 1 -I'{}' \ -sh -c 'file {} | grep broken | cut -f 1 -d :' | xargs rm -f - - - -mkdir -p $PREFIX/etc/conda/{activate.d,deactivate.d} - -echo " -# Workaround for conda >4.1.2 -if [[ -n \$CONDA_PREFIX ]]; then - export CONDA_ENV_PATH=\$CONDA_PREFIX -fi -export IRAFARCH=$IRAFARCH -export iraf=\$CONDA_ENV_PATH/iraf/ -export MACH=\$IRAFARCH -export hostid=unix -export host=\$iraf/\$hostid/ -export hbin=\$host/bin.\$IRAFARCH/ -export IMTOOLRC=\$iraf/dev/imtoolrc -export tmp=/tmp/ - -export CC=gcc -export F2C=\$hbin/f2c.e -export F77=\$hbin/f77.sh -export RANLIB=ranlib - -case "\$IRAFARCH" in -macosx) -export HSI_CF=\"-I\$iraf/include -O -DMACOSX -w -Wunused -arch i386 -m32 -mmacosx-version-min=10.4\" -export HSI_XF=\"-I\$iraf/include -Inolibc -/DMACOSX -w -/Wunused -/m32 -/arch -//i386 -/mmacosx-version-min=10.4\" -export HSI_FF=\"-I\$iraf/include -O -arch i386 -m32 -DBLD_KERNEL -mmacosx-version-min=10.4\" -export HSI_LF=\"-I\$iraf/include -arch i386 -m32 -mmacosx-version-min=10.4\" -;; - -linux) -export HSI_CF=\"-I\$iraf/include -O -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused\" -export HSI_FF=\"-I\$iraf/include -O -DBLD_KERNEL -m32\" -export HSI_LF=\"-I\$iraf/include -m32\" -export HSI_XF=\"-I\$iraf/include -Inolibc -w -/Wunused -/m32\" -;; - -*) -echo "Unknown IRAFARCH. Dying." -exit 1 -;; - -esac - -export HSI_F77LIBS= -export HSI_LIBS=\"\$iraf/unix/hlib/libboot.a \$iraf/lib/libsys.a \$iraf/lib/libvops.a \$iraf/unix/hlib/libos.a\" -export HSI_OSLIBS= - -export UR_BITS=64 -export UR_CPU=x86_64 -export UR_DIR=\$CONDA_ENV_PATH -export UR_VARIANT=common -export UR_OS=$PLATFORM -export UR_TMP=/tmp -export UR_DIR_PKG=\$UR_DIR/variants/\$UR_VARIANT/ -" > $PREFIX/etc/conda/activate.d/iraf.sh -chmod 755 $PREFIX/etc/conda/activate.d/iraf.sh - -echo ' -if [[ -n \$CONDA_PREFIX ]]; then - unset CONDA_ENV_PATH -fi - -unset iraf -unset IRAFARCH -unset IMTOOLRC -unset F2C -unset F77 -unset hbin -unset hlib -unset host -unset CC -unset CC_f2c -unset HSI_CF -unset HSI_F77LIBS -unset HSI_FF -unset HSI_LF -unset HSI_LFLAGS -unset HSI_LIBS -unset HSI_OSLIBS -unset HSI_XF -unset MACH -unset OS_MACH -unset RANLIB -unset hostid -unset tmp -unset UR_BITS -unset UR_CPU -unset UR_DIR -unset UR_VARIANT -unset UR_OS -unset UR_TMP -unset UR_DIR_PKG -' > $PREFIX/etc/conda/deactivate.d/iraf.sh -chmod 755 $PREFIX/etc/conda/deactivate.d/iraf.sh diff --git a/iraf/meta.yaml b/iraf/meta.yaml deleted file mode 100644 index 2c9da54..0000000 --- a/iraf/meta.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{% set name = 'iraf' %} -{% set version = '2.16.1' %} -{% set number = '1' %} - -about: - home: http://iraf.noao.edu - license: MIT - summary: NOAO Image Reduction and Analysis Facility - -build: - binary_relocation: False [osx] - detect_binary_files_with_prefix: False [osx] - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -source: - fn: {{ name }}.tar.gz - url: - - http://ssb.stsci.edu/stripped/linux/{{ name }}.tar.gz [linux] - - http://ssb.stsci.edu/stripped/osx/{{ name }}.tar.gz [osx] diff --git a/jwst_coronagraph_visibility/meta.yaml b/jwst_coronagraph_visibility/meta.yaml index 4ff8271..53a66e7 100644 --- a/jwst_coronagraph_visibility/meta.yaml +++ b/jwst_coronagraph_visibility/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'jwst_coronagraph_visibility' %} {% set version = '0.3.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: # Package homepage @@ -26,14 +29,14 @@ source: requirements: build: - setuptools - - python x.x - - numpy + - python {{ python }} + - numpy {{ numpy }} - matplotlib - tk - requests - jwxml >=0.3.0 run: - - python x.x + - python - numpy - matplotlib - requests diff --git a/jwst_footprints/meta.yaml b/jwst_footprints/meta.yaml index 09ae18f..9c09f0e 100644 --- a/jwst_footprints/meta.yaml +++ b/jwst_footprints/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'jwst_footprints' %} {% set version = '2.2.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/jwst_coronagraph_visibility @@ -22,13 +25,13 @@ requirements: build: - astropy >=1.3 - matplotlib - - numpy + - numpy {{ numpy }} - pillow - pyds9 - scipy - tk - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.3 @@ -38,7 +41,7 @@ requirements: - pillow - pyds9 - tk - - python x.x + - python test: imports: diff --git a/jwst_gtvt/meta.yaml b/jwst_gtvt/meta.yaml index 7891317..c7b13d6 100644 --- a/jwst_gtvt/meta.yaml +++ b/jwst_gtvt/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'jwst_gtvt' %} {% set version = '0.1.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -20,15 +23,15 @@ requirements: build: - astropy - matplotlib - - numpy + - numpy {{ numpy }} - setuptools - - python x.x + - python {{ python }} run: - astropy - matplotlib - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/jwxml/bld.bat b/jwxml/bld.bat index 8d766c9..760380e 100644 --- a/jwxml/bld.bat +++ b/jwxml/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/jwxml/build.sh b/jwxml/build.sh index 535529d..6bd6081 100644 --- a/jwxml/build.sh +++ b/jwxml/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/jwxml/meta.yaml b/jwxml/meta.yaml index 7944be7..50836d0 100644 --- a/jwxml/meta.yaml +++ b/jwxml/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'jwxml' %} {% set version = '0.3.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/mperrin/{{ name }} @@ -17,13 +20,13 @@ package: requirements: build: - - numpy + - numpy {{ numpy }} - matplotlib - - python x.x + - python {{ python }} run: - numpy - matplotlib - - python x.x + - python source: git_tag: {{ version }} diff --git a/lapack/bld.bat b/lapack/bld.bat deleted file mode 100644 index 92a9d5a..0000000 --- a/lapack/bld.bat +++ /dev/null @@ -1,7 +0,0 @@ - - -mkdir BUILD_DIR -cd BUILD_DIR -cmake -DCMAKE_INSTALL_PREFIX=%PREFIX% -make -make install \ No newline at end of file diff --git a/lapack/build.sh b/lapack/build.sh deleted file mode 100644 index ffedbfe..0000000 --- a/lapack/build.sh +++ /dev/null @@ -1,13 +0,0 @@ - - -mkdir BUILD_DIR -cd BUILD_DIR -cmake \ --DCMAKE_INSTALL_PREFIX=$PREFIX \ --DBUILD_TESTING=OFF \ --DBUILD_SHARED_LIBS=ON \ --DLAPACKE=ON \ -.. - -make -j${CPU_COUNT} -make install \ No newline at end of file diff --git a/lapack/meta.yaml b/lapack/meta.yaml deleted file mode 100644 index bbd0aa8..0000000 --- a/lapack/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{% set name = 'lapack' %} -{% set version = '3.6.0' %} -{% set number = '0' %} - -about: - home: http://www.netlib.org - license: BSD - summary: | - LAPACK is written in Fortran 90 and provides routines for solving - systems of simultaneous linear equations, least-squares solutions - of linear systems of equations, eigenvalue problems, and singular - value problems - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - cmake - -source: - fn: {{ name }}-{{ version }}.tgz - url: http://www.netlib.org/{{ name }}/{{ name }}-{{ version }}.tgz diff --git a/linecache2/bld.bat b/linecache2/bld.bat deleted file mode 100644 index b290566..0000000 --- a/linecache2/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/linecache2/build.sh b/linecache2/build.sh deleted file mode 100644 index 5c44dc5..0000000 --- a/linecache2/build.sh +++ /dev/null @@ -1,3 +0,0 @@ - -find . -name "inspect_fodder2.py" -delete -python setup.py install || exit 1 \ No newline at end of file diff --git a/linecache2/meta.yaml b/linecache2/meta.yaml deleted file mode 100644 index b83230e..0000000 --- a/linecache2/meta.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{% set name = 'linecache2' %} -{% set version = '1.0.0' %} -{% set number = '0' %} -about: - home: https://pypi.python.org/packages/source/l/{{ name }} - license: BSD - summary: Backports of the linecache module - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - pbr - - setuptools - - python x.x - run: - - pbr - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 7b25d0289ec36bff1f9e63c4329ce65c - url: https://pypi.python.org/packages/source/l/{{ name }}/{{ name }}-{{ version }}.tar.gz -test: - imports: - - linecache2 diff --git a/mechanize/bld.bat b/mechanize/bld.bat deleted file mode 100644 index b290566..0000000 --- a/mechanize/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/mechanize/build.sh b/mechanize/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/mechanize/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/mechanize/meta.yaml b/mechanize/meta.yaml deleted file mode 100644 index bdcb90d..0000000 --- a/mechanize/meta.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{% set name = 'mechanize' %} -{% set version = '0.2.5' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/m/{{ name }} - license: BSD - summary: Stateful programmatic web browsing - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 32657f139fc2fb75bcf193b63b8c60b2 - url: - - https://pypi.python.org/packages/source/m/{{ name }}/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - mechanize diff --git a/mosviz/build.sh b/mosviz/build.sh index 2291246..5a5aeeb 100644 --- a/mosviz/build.sh +++ b/mosviz/build.sh @@ -1,5 +1 @@ -# Remove reference to glueviz from setup script, since this breaks the build -# as there is no file containing 'glueviz' produced for that package since -# glueviz has become a metapackage. -sed -i -e "/'glueviz.*',$/d" setup.py $PYTHON setup.py install diff --git a/mosviz/meta.yaml b/mosviz/meta.yaml index 3d1ce69..71b47e3 100644 --- a/mosviz/meta.yaml +++ b/mosviz/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'mosviz' %} {% set version = '0.1.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/mosviz @@ -23,24 +26,24 @@ source: requirements: build: - astropy - - specutils - - glueviz >=0.9.0 + - glue-core >=0.11.0 - matplotlib >=1.5.3 - - numpy - - python x.x + - specutils <=0.2.2 + - numpy {{ numpy }} + - python {{ python }} run: - astropy - - specutils - - glueviz >=0.9.0 + - glue-core >=0.11.0 - matplotlib >=1.5.3 + - specutils <=0.2.2 - numpy - - python x.x + - python test: requires: - astropy - - specutils + - specutils <=0.2.2 imports: - mosviz diff --git a/nictools/bld.bat b/nictools/bld.bat index 8d766c9..760380e 100644 --- a/nictools/bld.bat +++ b/nictools/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/nictools/build.sh b/nictools/build.sh index 88ffa4c..5a5aeeb 100644 --- a/nictools/build.sh +++ b/nictools/build.sh @@ -1,3 +1 @@ - -pip install --no-deps --upgrade --force d2to1 -python setup.py install || exit 1 \ No newline at end of file +$PYTHON setup.py install diff --git a/nictools/meta.yaml b/nictools/meta.yaml index 5949325..dba8ac2 100644 --- a/nictools/meta.yaml +++ b/nictools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'nictools' %} {% set version = '1.1.3' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -17,18 +20,18 @@ package: requirements: build: - astropy >=1.1 - - numpy + - numpy {{ numpy }} - scipy - stsci.distutils - stsci.tools - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.1 - numpy - scipy - stsci.tools - - python x.x + - python source: git_tag: {{ version }} diff --git a/opuscoords/bld.bat b/opuscoords/bld.bat deleted file mode 100644 index 5d42b68..0000000 --- a/opuscoords/bld.bat +++ /dev/null @@ -1,4 +0,0 @@ - - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/opuscoords/build.sh b/opuscoords/build.sh deleted file mode 100644 index 535529d..0000000 --- a/opuscoords/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 diff --git a/opuscoords/meta.yaml b/opuscoords/meta.yaml deleted file mode 100644 index 2ccfcaa..0000000 --- a/opuscoords/meta.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{% set name = 'opuscoords' %} -{% set version = '1.0.2' %} -{% set number = '1' %} - -about: - home: https://github.com/spacetelescope/{{ name }} - license: BSD - summary: Python Tools for OPUS Coordinate Conversions - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - d2to1 - - stsci.distutils - - setuptools - - numpy - - python x.x - run: - - numpy - - python x.x - -source: - git_tag: {{ version }} - git_url: https://github.com/spacetelescope/{{ name }}.git - -test: - imports: - - opuscoords diff --git a/pandokia/bld.bat b/pandokia/bld.bat index b290566..760380e 100644 --- a/pandokia/bld.bat +++ b/pandokia/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/pandokia/build.sh b/pandokia/build.sh index 4b71885..56f0b30 100644 --- a/pandokia/build.sh +++ b/pandokia/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/pandokia/meta.yaml b/pandokia/meta.yaml index 6b9a2ff..1d684a6 100644 --- a/pandokia/meta.yaml +++ b/pandokia/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pandokia' %} {% set version = '1.3.11' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: http://ssb.stsci.edu/testing/{{ name }} @@ -20,12 +23,12 @@ requirements: - pytest - shunit2 - setuptools - - python x.x + - python {{ python }} run: - nose - shunit2 - pytest - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/parsley/bld.bat b/parsley/bld.bat index b290566..760380e 100644 --- a/parsley/bld.bat +++ b/parsley/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/parsley/build.sh b/parsley/build.sh index 26f5f99..dc9064b 100644 --- a/parsley/build.sh +++ b/parsley/build.sh @@ -1,2 +1,2 @@ echo > README -python setup.py install +$PYTHON setup.py install diff --git a/parsley/meta.yaml b/parsley/meta.yaml index 1c23d30..24e13f0 100644 --- a/parsley/meta.yaml +++ b/parsley/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'parsley' %} {% set badname = 'Parsley' %} {% set version = '1.3' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://pypi.python.org/packages/source/P/{{ badname }} @@ -19,9 +22,9 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: fn: Parsley-{{ version }}.tar.gz diff --git a/photutils/bld.bat b/photutils/bld.bat index b290566..760380e 100644 --- a/photutils/bld.bat +++ b/photutils/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/photutils/build.sh b/photutils/build.sh index 5c61be1..5a5aeeb 100644 --- a/photutils/build.sh +++ b/photutils/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/photutils/meta.yaml b/photutils/meta.yaml index a0be16b..4e40235 100644 --- a/photutils/meta.yaml +++ b/photutils/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'photutils' %} {% set version = '0.4' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/astropy/{{ name }} @@ -26,7 +29,7 @@ requirements: - scipy >=0.16 - six - setuptools - - python x.x + - python {{ python }} run: - astropy >=2.0 - cython @@ -37,7 +40,7 @@ requirements: - scipy >=0.16 - six - setuptools - - python x.x + - python source: git_tag: {{ tag }} diff --git a/poppy/bld.bat b/poppy/bld.bat index b290566..760380e 100644 --- a/poppy/bld.bat +++ b/poppy/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/poppy/build.sh b/poppy/build.sh index 4b71885..56f0b30 100644 --- a/poppy/build.sh +++ b/poppy/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/poppy/meta.yaml b/poppy/meta.yaml index 972ac7a..0f4144b 100644 --- a/poppy/meta.yaml +++ b/poppy/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'poppy' %} {% set version = '0.6.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/mperrin/{{ name }} @@ -20,13 +23,13 @@ package: requirements: build: - astropy >=1.1 - - numpy + - numpy {{ numpy }} - scipy - matplotlib - six [py27] - enum34 [py27] - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.1 - numpy @@ -35,7 +38,7 @@ requirements: - six [py27] - enum34 [py27] - setuptools - - python x.x + - python source: git_tag: {{ tag }} diff --git a/purge_path/bld.bat b/purge_path/bld.bat deleted file mode 100644 index b290566..0000000 --- a/purge_path/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/purge_path/build.sh b/purge_path/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/purge_path/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/purge_path/meta.yaml b/purge_path/meta.yaml deleted file mode 100644 index 807ac09..0000000 --- a/purge_path/meta.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{% set name = 'purge_path' %} -{% set version = '1.2.0' %} -{% set number = '0' %} - -about: - home: https://github.com/jhunkeler/{{ name }} - license: BSD - summary: purge_path a small PATH manipulator - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - python x.x - - setuptools - run: - - python x.x - -source: - git_tag: {{ version }} - git_url: https://github.com/jhunkeler/{{ name }}.git diff --git a/py-expression-eval/meta.yaml b/py-expression-eval/meta.yaml index 1222220..0fa080e 100644 --- a/py-expression-eval/meta.yaml +++ b/py-expression-eval/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'py-expression-eval' %} {% set version = '0.3.4' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/Axiacore/{{ name }} @@ -18,7 +21,7 @@ build: requirements: build: - setuptools - - python + - python {{ python }} run: - python diff --git a/pydrizzle/bld.bat b/pydrizzle/bld.bat deleted file mode 100644 index d733f00..0000000 --- a/pydrizzle/bld.bat +++ /dev/null @@ -1,5 +0,0 @@ -pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 - -python setup.py install || exit 1 -if errorlevel 1 exit 1 diff --git a/pydrizzle/build.sh b/pydrizzle/build.sh deleted file mode 100644 index f5ed7a2..0000000 --- a/pydrizzle/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -pip install --no-deps --upgrade --force d2to1 || exit 1 -python setup.py install || exit 1 diff --git a/pydrizzle/meta.yaml b/pydrizzle/meta.yaml deleted file mode 100644 index a41de47..0000000 --- a/pydrizzle/meta.yaml +++ /dev/null @@ -1,39 +0,0 @@ -{% set name = 'pydrizzle' %} -{% set version = '6.4.4' %} -{% set number = '1' %} - -about: - home: https://github.com/spacetelescope/{{ name }} - license: BSD - summary: Geometrically correct and combine images using Drizzle - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - d2to1 - - astropy >=1.1 - - setuptools - - stsci.distutils - - stsci.tools - - numpy - - python x.x - run: - - astropy >=1.1 - - stsci.tools - - wxpython [py27] - - numpy - - python x.x - -source: - git_tag: {{ version }} - git_url: https://github.com/spacetelescope/{{ name }}.git - -test: - imports: - - pydrizzle 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 diff --git a/pyfftw/bld.bat b/pyfftw/bld.bat index b290566..760380e 100644 --- a/pyfftw/bld.bat +++ b/pyfftw/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/pyfftw/build.sh b/pyfftw/build.sh index d89cf74..0651338 100644 --- a/pyfftw/build.sh +++ b/pyfftw/build.sh @@ -1,4 +1,4 @@ export CFLAGS="`pkg-config --cflags fftw3`" export LDFLAGS="`pkg-config --libs fftw3`" -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/pyfftw/meta.yaml b/pyfftw/meta.yaml index 291e754..362af0b 100644 --- a/pyfftw/meta.yaml +++ b/pyfftw/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyfftw' %} {% set version = '0.9.2' %} -{% set number = '2' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '3' %} about: home: http://hgomersall.github.com/pyFFTW @@ -22,13 +25,13 @@ requirements: - cython - pkg-config [osx] - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - cython - fftw - numpy - - python x.x + - python source: fn: pyFFTW-{{ version }}.tar.gz diff --git a/pyobjc-core/bld.bat b/pyobjc-core/bld.bat index b290566..760380e 100644 --- a/pyobjc-core/bld.bat +++ b/pyobjc-core/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/pyobjc-core/build.sh b/pyobjc-core/build.sh index 77ff075..3ac7454 100644 --- a/pyobjc-core/build.sh +++ b/pyobjc-core/build.sh @@ -1,3 +1,3 @@ cd pyobjc-core export CFLAGS="$CFLAGS -headerpad_max_install_names" -python setup.py install +$PYTHON setup.py install diff --git a/pyobjc-core/meta.yaml b/pyobjc-core/meta.yaml index bf62a36..546e52b 100644 --- a/pyobjc-core/meta.yaml +++ b/pyobjc-core/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyobjc-core' %} {% set version = '3.1.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://pyobjc.sourceforge.net/ @@ -19,9 +22,9 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: fn: pyobjc-{{ version }}.tar.gz diff --git a/pyobjc-framework-cocoa/build.sh b/pyobjc-framework-cocoa/build.sh index 7d1f8d3..d61f521 100644 --- a/pyobjc-framework-cocoa/build.sh +++ b/pyobjc-framework-cocoa/build.sh @@ -1,3 +1,3 @@ cd pyobjc-framework-Cocoa export CFLAGS="$CFLAGS -headerpad_max_install_names" -python setup.py install +$PYTHON setup.py install diff --git a/pyobjc-framework-cocoa/meta.yaml b/pyobjc-framework-cocoa/meta.yaml index 3abc490..94825d7 100644 --- a/pyobjc-framework-cocoa/meta.yaml +++ b/pyobjc-framework-cocoa/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyobjc-framework-cocoa' %} {% set version = '3.1.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://pyobjc.sourceforge.net/ @@ -20,10 +23,10 @@ requirements: build: - pyobjc-core =={{ version }} - setuptools - - python x.x + - python {{ python }} run: - pyobjc-core - - python x.x + - python source: fn: pyobjc-{{ version }}.tar.gz diff --git a/pyobjc-framework-quartz/build.sh b/pyobjc-framework-quartz/build.sh index d83cacd..9190134 100644 --- a/pyobjc-framework-quartz/build.sh +++ b/pyobjc-framework-quartz/build.sh @@ -1,3 +1,3 @@ cd pyobjc-framework-Quartz export CFLAGS="$CFLAGS -headerpad_max_install_names" -python setup.py install +$PYTHON setup.py install diff --git a/pyobjc-framework-quartz/meta.yaml b/pyobjc-framework-quartz/meta.yaml index b0303aa..5f1a895 100644 --- a/pyobjc-framework-quartz/meta.yaml +++ b/pyobjc-framework-quartz/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyobjc-framework-quartz' %} {% set version = '3.1.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://pyobjc.sourceforge.net/ @@ -21,11 +24,11 @@ requirements: - pyobjc-core =={{ version }} - pyobjc-framework-cocoa =={{ version }} - setuptools - - python x.x + - python {{ python }} run: - pyobjc-core =={{ version }} - pyobjc-framework-cocoa =={{ version }} - - python x.x + - python source: fn: pyobjc-{{ version }}.tar.gz diff --git a/pyqtgraph/bld.bat b/pyqtgraph/bld.bat deleted file mode 100644 index b290566..0000000 --- a/pyqtgraph/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/pyqtgraph/build.sh b/pyqtgraph/build.sh deleted file mode 100644 index ba551f7..0000000 --- a/pyqtgraph/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -git tag -a 0.9.11.dev -m 'Fake update to 0.9.11' -python setup.py install || exit 1 diff --git a/pyqtgraph/meta.yaml b/pyqtgraph/meta.yaml deleted file mode 100644 index 5867179..0000000 --- a/pyqtgraph/meta.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{% set name = 'pyqtgraph' %} -{% set version = '0.10.0' %} -{% set tag = name + '-' + version %} -{% set number = '0' %} - -about: - home: http://www.pyqtgraph.org/ - license: MIT - summary: | - A pure-Python graphics library for PyQt/PySide - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - numpy - - python x.x - run: - - pyqt - - pyopengl - - numpy - - python x.x - -source: - git_tag: {{ tag }} - git_url: https://github.com/pyqtgraph/{{ name }}.git - -test: - imports: - - pyqtgraph diff --git a/pyraf/bld.bat b/pyraf/bld.bat index 976d3b9..7fba400 100644 --- a/pyraf/bld.bat +++ b/pyraf/bld.bat @@ -1,5 +1,3 @@ -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/pyraf/build.sh b/pyraf/build.sh index 3974e86..08480f2 100644 --- a/pyraf/build.sh +++ b/pyraf/build.sh @@ -12,4 +12,4 @@ set +e fi fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml index 2380480..e75dbba 100644 --- a/pyraf/meta.yaml +++ b/pyraf/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyraf' %} {% set version = '2.1.11' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -26,8 +29,8 @@ requirements: - pyobjc-framework-quartz >=3.0.4 [osx] - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - ipython @@ -37,7 +40,7 @@ requirements: - pyobjc-framework-quartz >=3.0.4 [osx] - stsci.tools - numpy - - python x.x + - python source: git_tag: {{ version }} 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: diff --git a/pysynphot/bld.bat b/pysynphot/bld.bat index 8d766c9..760380e 100644 --- a/pysynphot/bld.bat +++ b/pysynphot/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/pysynphot/build.sh b/pysynphot/build.sh index 535529d..6bd6081 100644 --- a/pysynphot/build.sh +++ b/pysynphot/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/pysynphot/meta.yaml b/pysynphot/meta.yaml index d9e5817..93a02df 100644 --- a/pysynphot/meta.yaml +++ b/pysynphot/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pysynphot' %} {% set version = '0.9.8.8' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -14,15 +17,15 @@ package: requirements: build: - astropy >=1.1 - - numpy + - numpy {{ numpy }} - pytest - - python x.x + - python {{ python }} - setuptools run: - astropy >=1.1 - numpy - pytest - - python x.x + - python source: git_tag: {{ version }} git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/python-daemon/bld.bat b/python-daemon/bld.bat deleted file mode 100644 index b290566..0000000 --- a/python-daemon/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/python-daemon/build.sh b/python-daemon/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/python-daemon/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/python-daemon/meta.yaml b/python-daemon/meta.yaml deleted file mode 100644 index ce24ebb..0000000 --- a/python-daemon/meta.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{% set name = 'python-daemon' %} -{% set version = '2.0.5' %} -{% set number = '0' %} - -about: - home: https://pagure.io/{{ name }} - license: Apache-2 - summary: Library to implement a well-behaved Unix daemon process. - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - docutils - - lockfile - - python x.x - run: - - lockfile - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 73e7f49f525c51fa4a995aea4d80de41 - url: https://pypi.python.org/packages/source/p/{{ name }}/{{ name }}-{{ version }}.tar.gz diff --git a/pytools/bld.bat b/pytools/bld.bat deleted file mode 100644 index b290566..0000000 --- a/pytools/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/pytools/build.sh b/pytools/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/pytools/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/pytools/meta.yaml b/pytools/meta.yaml deleted file mode 100644 index ec2fd6c..0000000 --- a/pytools/meta.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{% set name = 'pytools' %} -{% set version = '2016.1' %} -{% set number = '2' %} - -about: - home: https://pypi.python.org/{{ name }} - license: MIT - summary: A collection of tools for Python - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - decorator >=3.2.0 - - appdirs >=1.4.0 - - six >=1.8.0 - - setuptools - - numpy - - python x.x - run: - - decorator >=3.2.0 - - appdirs >=1.4.0 - - six >=1.8.0 - - numpy - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: d8af5c5bea24aa4a21881684dcf03b06 - url: - - https://pypi.python.org/packages/source/p/{{ name }}/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - pytools diff --git a/pywcs/bld.bat b/pywcs/bld.bat deleted file mode 100644 index d1ddf28..0000000 --- a/pywcs/bld.bat +++ /dev/null @@ -1,7 +0,0 @@ - -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 diff --git a/pywcs/build.sh b/pywcs/build.sh deleted file mode 100644 index 5e8b365..0000000 --- a/pywcs/build.sh +++ /dev/null @@ -1,4 +0,0 @@ - -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 diff --git a/pywcs/meta.yaml b/pywcs/meta.yaml deleted file mode 100644 index 40858fd..0000000 --- a/pywcs/meta.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{% set name = 'pywcs' %} -{% set version = '1.12.1' %} -{% set number = '1' %} - -about: - home: https://github.com/spacetelescope/{{ name }} - license: BSD - summary: | - Python wrappers to WCSLIB - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - d2to1 - - stsci.distutils - - stsci.tools - - numpy - - setuptools - - python x.x - run: - - stsci.tools - - numpy - - python x.x - -source: - git_url: https://github.com/spacetelescope/{{ name }}.git - -test: - imports: - - pywcs diff --git a/qtpy/LICENSE b/qtpy/LICENSE deleted file mode 100644 index 04ad21b..0000000 --- a/qtpy/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -BSD 3-clause license -Copyright (c) conda-forge -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/qtpy/meta.yaml b/qtpy/meta.yaml deleted file mode 100644 index 13e9e2b..0000000 --- a/qtpy/meta.yaml +++ /dev/null @@ -1,37 +0,0 @@ -{% set name = 'qtpy' %} -{% set version = '1.1.1' %} -{% set number = '0' %} - -package: - name: {{ name }} - version: {{ version }} - -source: - fn: {{ name }}-{{ version }}.tar.gz - url: https://pypi.io/packages/source/q/{{ name }}/QtPy-{{ version }}.tar.gz - md5: 181a1cc9c010e0c1f4daa3f0f69e3782 - -build: - number: {{ number }} - script: python setup.py install --single-version-externally-managed --record record.txt - -requirements: - - build: - - python - - setuptools - - run: - - python - -test: - requires: - - pyqt - imports: - - qtpy - -about: - home: https://github.com/spyder-ide/qtpy - license: MIT - summary: A uniform layer to support PyQt5, PyQt4 and PySide with a single codebase - diff --git a/reftools/bld.bat b/reftools/bld.bat index af492e4..760380e 100644 --- a/reftools/bld.bat +++ b/reftools/bld.bat @@ -1,3 +1,2 @@ -python setup.py install || exit 1 -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/reftools/build.sh b/reftools/build.sh index 5c61be1..5a5aeeb 100644 --- a/reftools/build.sh +++ b/reftools/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/reftools/meta.yaml b/reftools/meta.yaml index aad3b97..35dc2d0 100644 --- a/reftools/meta.yaml +++ b/reftools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'reftools' %} {% set version = '1.7.4' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -17,13 +20,13 @@ package: requirements: build: - astropy >=1.1 - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} - setuptools run: - astropy >=1.1 - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/relic/bld.bat b/relic/bld.bat index 2d6c912..39b5e1f 100644 --- a/relic/bld.bat +++ b/relic/bld.bat @@ -1,2 +1 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/relic/build.sh b/relic/build.sh index 5c61be1..5a5aeeb 100644 --- a/relic/build.sh +++ b/relic/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/relic/meta.yaml b/relic/meta.yaml index daa1eaf..2052aeb 100644 --- a/relic/meta.yaml +++ b/relic/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'relic' %} {% set version = '1.0.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://github.com/jhunkeler/{{ name }} @@ -17,9 +20,9 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: git_tag: {{ version }} diff --git a/secretstorage/bld.bat b/secretstorage/bld.bat index c40a9bb..2bb965d 100644 --- a/secretstorage/bld.bat +++ b/secretstorage/bld.bat @@ -1,2 +1 @@ "%PYTHON%" setup.py install -if errorlevel 1 exit 1 diff --git a/secretstorage/meta.yaml b/secretstorage/meta.yaml index afa3f50..f984542 100644 --- a/secretstorage/meta.yaml +++ b/secretstorage/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'secretstorage' %} {% set version = '2.3.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/mitya57/{{ name }} @@ -22,7 +25,7 @@ source: requirements: build: - - python + - python {{ python }} - dbus-python - setuptools - cryptography diff --git a/selenium/bld.bat b/selenium/bld.bat deleted file mode 100644 index b290566..0000000 --- a/selenium/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/selenium/build.sh b/selenium/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/selenium/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/selenium/meta.yaml b/selenium/meta.yaml deleted file mode 100644 index 60b9e77..0000000 --- a/selenium/meta.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{% set name = 'selenium' %} -{% set version = '2.49.2' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/s/{{ name }} - license: BSD - summary: Python bindings for Selenium - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 17cfe7c6adb2cad1f64a61cf753f0738 - url: https://pypi.python.org/packages/source/s/{{ name }}/{{ name }}-{{ version }}.tar.gz -test: - imports: - - selenium diff --git a/sextractor-generic/bld.bat b/sextractor-generic/bld.bat deleted file mode 100644 index 95a6a85..0000000 --- a/sextractor-generic/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -echo Unsupported \ No newline at end of file diff --git a/sextractor-generic/build.sh b/sextractor-generic/build.sh deleted file mode 100644 index 59c06c0..0000000 --- a/sextractor-generic/build.sh +++ /dev/null @@ -1,26 +0,0 @@ - -ATLAS=/usr -LIBDIR=lib -case $(uname) in -Linux) -if [[ $(uname -m) == *x86_64* ]]; then -LIBDIR=lib64/atlas -else -LIBDIR=lib/atlas -fi -;; -Darwin) -ATLAS=/usr/local/atlas -;; -*) -;; -esac - -./configure --prefix=$PREFIX \ ---with-fftw-libdir=$PREFIX/lib \ ---with-fftw-incdir=$PREFIX/include \ ---with-atlas-libdir="$ATLAS/$LIBDIR" \ ---with-atlas-incdir="$ATLAS/include" - -make -j ${CPU_COUNT} -make install \ No newline at end of file diff --git a/sextractor-generic/meta.yaml b/sextractor-generic/meta.yaml deleted file mode 100644 index 76f893d..0000000 --- a/sextractor-generic/meta.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{% set name = 'sextractor-generic' %} -{% set version = '2.19.5' %} -{% set number = '0' %} - -about: - home: http://www.astromatic.net/download/sextractor - license: GPL - summary: Generic (unoptimized) Source Extractor - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - fftw - - pkgconfig - - atlas-generic [osx] - run: - - fftw - - atlas-generic [osx] - -source: - fn: {{ name }}-{{ version }}.tar.gz - url: http://www.astromatic.net/download/{{ name }}/{{ name }}-{{ version }}.tar.gz diff --git a/sextractor/build.sh b/sextractor/build.sh index 4a7f951..3c1302d 100644 --- a/sextractor/build.sh +++ b/sextractor/build.sh @@ -1,28 +1,11 @@ -export ATLAS="$PREFIX" -OPTIONS= -case $(uname) in - Linux) - OPTIONS="--with-atlas-libdir=$ATLAS/lib --with-atlas-incdir=$ATLAS/include" - ;; - - Darwin) - curl https://gist.githubusercontent.com/mwcraig/ae66eadcd0f266e7138f/raw/f4625508784e75c7b3ce11d8a578589425533282/acx_accelerate.m4.diff | patch -p1 -i - - curl https://gist.githubusercontent.com/mwcraig/4f61431f177b6cc0085a/raw/bf4d29a7a51ccec1ef224006fd10ac260a31c37c/configure.ac.diff | patch -p1 -i - - curl https://gist.githubusercontent.com/mwcraig/b423656698987b6bc492/raw/f23c4b50d972de4e7902fe3d4fa1363400a98f8f/pattern.c.diff | patch -p1 -i - - - OPTIONS="--enable-accelerate" - autoconf - autoheader - ;; - - *) - ;; -esac +rm -rf aclocal.m4 autom4te.cache +libtoolize -f -i +autoreconf -i ./configure --prefix=$PREFIX \ --with-fftw-libdir=$PREFIX/lib \ --with-fftw-incdir=$PREFIX/include \ ${OPTIONS} -make -j ${CPU_COUNT} +make -j ${CPU_COUNT} LDFLAGS=-liomp5 make install diff --git a/sextractor/meta.yaml b/sextractor/meta.yaml index d8fa4ed..3883c1d 100644 --- a/sextractor/meta.yaml +++ b/sextractor/meta.yaml @@ -1,5 +1,8 @@ {% set name = 'sextractor' %} {% set version = '2.19.5' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} about: home: http://www.astromatic.net/download/{{ name }} @@ -17,15 +20,24 @@ package: requirements: build: - - atlas-generic [linux] - - autoconf [osx] - - m4 [osx] + - autoconf + - automake - fftw + - gcc + - libtool + - m4 + - mkl-devel - pkgconfig + run: - atlas-generic [linux] - fftw source: fn: {{ name }}-{{ version }}.tar.gz - url: http://www.astromatic.net/download/sextractor/{{ name }}-{{ version }}.tar.gz + url: https://github.com/astromatic/sextractor/archive/{{ version }}.tar.gz + md5: 8b5d957c80d93396503a8bf6698f000a + +test: + commands: + - sex --help diff --git a/shunit2/meta.yaml b/shunit2/meta.yaml index 39eefc4..88a637c 100644 --- a/shunit2/meta.yaml +++ b/shunit2/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'shunit2' %} {% set version = '2.0.3' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://sourceforge.net/projects/{{ version }} diff --git a/specutils/meta.yaml b/specutils/meta.yaml index 0cded55..5ea8648 100644 --- a/specutils/meta.yaml +++ b/specutils/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'specutils' %} {% set version = '0.2.2' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/astropy/specutils @@ -25,13 +28,13 @@ requirements: - cython - scipy - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - scipy - numpy - - python x.x + - python test: imports: diff --git a/specviz/meta.yaml b/specviz/meta.yaml index b4f1276..cc1c11a 100644 --- a/specviz/meta.yaml +++ b/specviz/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'specviz' %} {% set version = '0.4.4' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} package: name: {{ name }} @@ -19,7 +22,7 @@ requirements: - astropy - cython - docopt - - specutils + - specutils <=0.2.2 - py-expression-eval - pyyaml - pyqtgraph >=0.9.11 @@ -29,14 +32,14 @@ requirements: - yaml - setuptools - six - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - cython - docopt - - specutils + - specutils <=0.2.2 - py-expression-eval - pyyaml - pyqtgraph >=0.9.11 @@ -46,12 +49,12 @@ requirements: - yaml - six - numpy - - python x.x + - python test: requires: - astropy - - specutils + - specutils <=0.2.2 imports: - specviz diff --git a/spherical-geometry/bld.bat b/spherical-geometry/bld.bat index 762d43b..39b5e1f 100644 --- a/spherical-geometry/bld.bat +++ b/spherical-geometry/bld.bat @@ -1 +1 @@ -python setup.py install +%PYTHON% setup.py install diff --git a/spherical-geometry/build.sh b/spherical-geometry/build.sh index 762d43b..5a5aeeb 100644 --- a/spherical-geometry/build.sh +++ b/spherical-geometry/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/spherical-geometry/meta.yaml b/spherical-geometry/meta.yaml index 121f881..bb30c83 100644 --- a/spherical-geometry/meta.yaml +++ b/spherical-geometry/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'spherical-geometry' %} {% set reponame = 'spherical_geometry' %} {% set version = '1.0.12' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ reponame }} @@ -20,13 +23,13 @@ requirements: - astropy >=1.1 - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - matplotlib - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/sphinx_rtd_theme/bld.bat b/sphinx_rtd_theme/bld.bat deleted file mode 100644 index b290566..0000000 --- a/sphinx_rtd_theme/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/sphinx_rtd_theme/build.sh b/sphinx_rtd_theme/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/sphinx_rtd_theme/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/sphinx_rtd_theme/meta.yaml b/sphinx_rtd_theme/meta.yaml deleted file mode 100644 index 734fa1e..0000000 --- a/sphinx_rtd_theme/meta.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{% set name = 'sphinx_rtd_theme' %} -{% set version = '0.1.9' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/s/{{ name }} - license: BSD - summary: | - ReadTheDocs.org theme for Sphinx, 2013 version - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - sphinx - - setuptools - - python x.x - run: - - sphinx - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 86a25c8d47147c872e42dc84cc66f97b - url: https://pypi.python.org/packages/source/s/{{ name }}/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - sphinx_rtd_theme diff --git a/sphinxcontrib-programoutput/bld.bat b/sphinxcontrib-programoutput/bld.bat index b290566..760380e 100644 --- a/sphinxcontrib-programoutput/bld.bat +++ b/sphinxcontrib-programoutput/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/sphinxcontrib-programoutput/build.sh b/sphinxcontrib-programoutput/build.sh index 4b71885..56f0b30 100644 --- a/sphinxcontrib-programoutput/build.sh +++ b/sphinxcontrib-programoutput/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/sphinxcontrib-programoutput/meta.yaml b/sphinxcontrib-programoutput/meta.yaml index 93c8a4d..1b72504 100644 --- a/sphinxcontrib-programoutput/meta.yaml +++ b/sphinxcontrib-programoutput/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'sphinxcontrib-programoutput' %} {% set version = '0.8' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://pypi.python.org/packages/source/s/{{ name }} @@ -20,10 +23,10 @@ requirements: build: - sphinx - setuptools - - python x.x + - python {{ python }} run: - sphinx - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz 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 }} diff --git a/stistools/bld.bat b/stistools/bld.bat index d1ddf28..39b5e1f 100644 --- a/stistools/bld.bat +++ b/stistools/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/stistools/build.sh b/stistools/build.sh index 5e8b365..5a5aeeb 100644 --- a/stistools/build.sh +++ b/stistools/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/stistools/meta.yaml b/stistools/meta.yaml index 6b84788..42f03cf 100644 --- a/stistools/meta.yaml +++ b/stistools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stistools' %} {% set version = '1.1' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,14 +25,14 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - scipy - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci-data-analysis/meta.yaml b/stsci-data-analysis/meta.yaml index 8f46f65..9eb8f95 100644 --- a/stsci-data-analysis/meta.yaml +++ b/stsci-data-analysis/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci-data-analysis' %} {% set version = '2.1.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://ssb.stsci.edu diff --git a/stsci-hst/meta.yaml b/stsci-hst/meta.yaml index 9e3c55e..b71b639 100644 --- a/stsci-hst/meta.yaml +++ b/stsci-hst/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci-hst' %} {% set version = '3.0.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://ssb.stsci.edu @@ -16,7 +19,6 @@ package: requirements: run: - - purge_path >=1.0.0 - acstools >=2.0.8 - astropy >=1.3 - calcos >=3.2.1 diff --git a/stsci.convolve/bld.bat b/stsci.convolve/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.convolve/bld.bat +++ b/stsci.convolve/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.convolve/build.sh b/stsci.convolve/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.convolve/build.sh +++ b/stsci.convolve/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/stsci.convolve/meta.yaml b/stsci.convolve/meta.yaml index 89c6798..1a80505 100644 --- a/stsci.convolve/meta.yaml +++ b/stsci.convolve/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.convolve' %} {% set version = '2.2.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,11 +22,11 @@ requirements: build: - d2to1 - stsci.distutils - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - numpy - - python x.x + - python source: git_tag: {{ version }} diff --git a/stsci.distutils/bld.bat b/stsci.distutils/bld.bat index eb68153..39b5e1f 100644 --- a/stsci.distutils/bld.bat +++ b/stsci.distutils/bld.bat @@ -1,7 +1 @@ - -echo This d2to1 hack is deadly. -REM 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/stsci.distutils/build.sh b/stsci.distutils/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.distutils/build.sh +++ b/stsci.distutils/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/stsci.distutils/meta.yaml b/stsci.distutils/meta.yaml index 305630a..9199971 100644 --- a/stsci.distutils/meta.yaml +++ b/stsci.distutils/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.distutils' %} {% set version = '0.3.8' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,12 +22,12 @@ requirements: build: - d2to1 - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - nose - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.image/bld.bat b/stsci.image/bld.bat index 695f708..39b5e1f 100644 --- a/stsci.image/bld.bat +++ b/stsci.image/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/stsci.image/build.sh b/stsci.image/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.image/build.sh +++ b/stsci.image/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/stsci.image/meta.yaml b/stsci.image/meta.yaml index 7034503..d770674 100644 --- a/stsci.image/meta.yaml +++ b/stsci.image/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.image' %} {% set version = '2.2.0' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -20,18 +23,18 @@ requirements: build: - d2to1 - astropy >=1.1 - - numpy + - numpy {{ numpy }} - scipy - stsci.distutils - stsci.tools - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.1 - numpy - scipy - stsci.tools - - python x.x + - python source: git_tag: {{ version }} diff --git a/stsci.imagemanip/bld.bat b/stsci.imagemanip/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.imagemanip/bld.bat +++ b/stsci.imagemanip/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.imagemanip/build.sh b/stsci.imagemanip/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.imagemanip/build.sh +++ b/stsci.imagemanip/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/stsci.imagemanip/meta.yaml b/stsci.imagemanip/meta.yaml index 7331313..9d04e8e 100644 --- a/stsci.imagemanip/meta.yaml +++ b/stsci.imagemanip/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.imagemanip' %} {% set version = '1.1.2' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,15 +21,15 @@ package: requirements: build: - d2to1 - - numpy + - numpy {{ numpy }} - stsci.distutils - stsci.tools - setuptools - - python x.x + - python {{ python }} run: - numpy - stsci.tools - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }} diff --git a/stsci.imagestats/bld.bat b/stsci.imagestats/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.imagestats/bld.bat +++ b/stsci.imagestats/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.imagestats/build.sh b/stsci.imagestats/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.imagestats/build.sh +++ b/stsci.imagestats/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/stsci.imagestats/meta.yaml b/stsci.imagestats/meta.yaml index 0d948d0..568b3f4 100644 --- a/stsci.imagestats/meta.yaml +++ b/stsci.imagestats/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.imagestats' %} {% set version = '1.4.1' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,11 +24,11 @@ requirements: - d2to1 - stsci.distutils - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.ndimage/bld.bat b/stsci.ndimage/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.ndimage/bld.bat +++ b/stsci.ndimage/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.ndimage/build.sh b/stsci.ndimage/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.ndimage/build.sh +++ b/stsci.ndimage/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/stsci.ndimage/meta.yaml b/stsci.ndimage/meta.yaml index 96dcd45..9339c7e 100644 --- a/stsci.ndimage/meta.yaml +++ b/stsci.ndimage/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.ndimage' %} {% set version = '0.10.1' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,12 +26,12 @@ requirements: - stsci.distutils - setuptools - astropy >=1.1 - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.numdisplay/bld.bat b/stsci.numdisplay/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.numdisplay/bld.bat +++ b/stsci.numdisplay/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.numdisplay/build.sh b/stsci.numdisplay/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.numdisplay/build.sh +++ b/stsci.numdisplay/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/stsci.numdisplay/meta.yaml b/stsci.numdisplay/meta.yaml index bff5b99..7dc17ae 100644 --- a/stsci.numdisplay/meta.yaml +++ b/stsci.numdisplay/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.numdisplay' %} {% set version = '1.6.1' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,14 +22,14 @@ package: requirements: build: - d2to1 - - numpy + - numpy {{ numpy }} - stsci.tools - setuptools - - python x.x + - python {{ python }} run: - numpy - stsci.tools - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.skypac/bld.bat b/stsci.skypac/bld.bat index 8d766c9..760380e 100644 --- a/stsci.skypac/bld.bat +++ b/stsci.skypac/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/stsci.skypac/build.sh b/stsci.skypac/build.sh index 1032cc4..5a5aeeb 100644 --- a/stsci.skypac/build.sh +++ b/stsci.skypac/build.sh @@ -1,27 +1 @@ - -function get_py_version() { -python --version 2>&1| awk '{sub(/-.*/,"",$2);print $2}' -} -export -f get_py_version - -function set_py3k() { -version=`get_py_version` -major=`echo $version | cut -d '.' -f 1` -minor=`echo $version | cut -d '.' -f 2` -hotfix=`echo $version | cut -d '.' -f 3` -if (( major > 2 )); then -export PY3K=1 -else -export PY3K=0 -fi -} -export -f set_py3k - -set_py3k - - -pip install --no-deps --upgrade --force d2to1 -if [ $PY3K -ne 0 ] ; then -sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg -fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml index cc6036c..af1998a 100644 --- a/stsci.skypac/meta.yaml +++ b/stsci.skypac/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.skypac' %} {% set version = '0.9.8' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -17,6 +20,7 @@ package: requirements: build: + - d2to1 - astropy >=1.1 - stsci.distutils - stsci.imagestats @@ -24,15 +28,15 @@ requirements: - stsci.tools - stwcs - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - stsci.imagestats - stsci.sphere - stsci.tools - stwcs - - python x.x + - python source: git_tag: {{ version }} diff --git a/stsci.sphinxext/bld.bat b/stsci.sphinxext/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.sphinxext/bld.bat +++ b/stsci.sphinxext/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.sphinxext/build.sh b/stsci.sphinxext/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.sphinxext/build.sh +++ b/stsci.sphinxext/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/stsci.sphinxext/meta.yaml b/stsci.sphinxext/meta.yaml index e009df2..ef64b95 100644 --- a/stsci.sphinxext/meta.yaml +++ b/stsci.sphinxext/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.sphinxext' %} {% set version = '1.2.2' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,11 +24,11 @@ requirements: - numpydoc - stsci.distutils - setuptools - - python x.x + - python {{ python }} run: - numpydoc - stsci.distutils - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.stimage/bld.bat b/stsci.stimage/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.stimage/bld.bat +++ b/stsci.stimage/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.stimage/build.sh b/stsci.stimage/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.stimage/build.sh +++ b/stsci.stimage/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/stsci.stimage/meta.yaml b/stsci.stimage/meta.yaml index 78b6131..80c3c4a 100644 --- a/stsci.stimage/meta.yaml +++ b/stsci.stimage/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.stimage' %} {% set version = '0.2.1' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,13 +21,13 @@ package: requirements: build: - d2to1 - - numpy + - numpy {{ numpy }} - stsci.distutils - setuptools - - python x.x + - python {{ python }} run: - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.tools/bld.bat b/stsci.tools/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.tools/bld.bat +++ b/stsci.tools/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 -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.tools/build.sh b/stsci.tools/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.tools/build.sh +++ b/stsci.tools/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/stsci.tools/meta.yaml b/stsci.tools/meta.yaml index 3581c7c..7064fc2 100644 --- a/stsci.tools/meta.yaml +++ b/stsci.tools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.tools' %} {% set version = '3.4.11' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/stsci.tools @@ -20,17 +23,15 @@ requirements: build: - d2to1 - astropy >=1.1 - - pytools - setuptools - stsci.distutils - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - numpy - - pytools - stsci.distutils - - python x.x + - python source: git_tag: {{ version }} diff --git a/stsci/meta.yaml b/stsci/meta.yaml index 6003ee5..03400da 100644 --- a/stsci/meta.yaml +++ b/stsci/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci' %} {% set version = '3.0.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://ssb.stsci.edu @@ -15,7 +18,6 @@ package: version: {{ version }} requirements: - build: - stsci-hst >=3.0.0 - stsci-data-analysis >=2.0.2 - astropy >=1.3 @@ -24,22 +26,7 @@ requirements: - ds9 >=7.1 - fftw >=3.3.4 - htc_utils >=0.1 - - purge_path >=1.0.0 - pyds9 >=1.8.1 - pyfftw >=0.9.2 - numpy - - python x.x - run: - - stsci-hst >=3.0.0 - - stsci-data-analysis >=2.0.2 - - astropy >=1.3 - - cfitsio >=3.370 - - d2to1 >=0.2.12 - - ds9 >=7.1 - - fftw >=3.3.4 - - htc_utils >=0.1 - - purge_path >=1.0.0 - - pyds9 >=1.8.1 - - pyfftw >=0.9.2 - - numpy - - python x.x + - python diff --git a/stsci_sphinx_theme/bld.bat b/stsci_sphinx_theme/bld.bat deleted file mode 100644 index 39b5e1f..0000000 --- a/stsci_sphinx_theme/bld.bat +++ /dev/null @@ -1 +0,0 @@ -%PYTHON% setup.py install diff --git a/stsci_sphinx_theme/build.sh b/stsci_sphinx_theme/build.sh deleted file mode 100644 index 5a5aeeb..0000000 --- a/stsci_sphinx_theme/build.sh +++ /dev/null @@ -1 +0,0 @@ -$PYTHON setup.py install diff --git a/stsci_sphinx_theme/meta.yaml b/stsci_sphinx_theme/meta.yaml deleted file mode 100644 index f722556..0000000 --- a/stsci_sphinx_theme/meta.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{% set name = 'stsci_sphinx_theme' %} -{% set version = '0.1.0' %} -{% set tag = 'v' + version %} -{% set number = '0' %} - -package: - name: {{ name }} - version: {{ version }} - -build: - number: {{ number }} - -source: - git_tag: {{ tag }} - git_url: https://github.com/spacetelescope/stsci_sphinx_theme.git - -requirements: - build: - - sphinx >=1.1 - - setuptools - - python x.x - - run: - - sphinx >=1.1 - - python x.x - -test: - requires: - - stsci_sphinx_theme - imports: - - stsci_sphinx_theme - -about: - home: https://github.com/spacetelescope/stsci_sphinx_theme - license: BSD diff --git a/stsynphot/bld.bat b/stsynphot/bld.bat index 98bf5c5..39b5e1f 100644 --- a/stsynphot/bld.bat +++ b/stsynphot/bld.bat @@ -1,2 +1 @@ -python setup.py install || exit 1 -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/stsynphot/build.sh b/stsynphot/build.sh index 5c61be1..5a5aeeb 100644 --- a/stsynphot/build.sh +++ b/stsynphot/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/stsynphot/meta.yaml b/stsynphot/meta.yaml index f1a5cf6..32af8e4 100644 --- a/stsynphot/meta.yaml +++ b/stsynphot/meta.yaml @@ -1,7 +1,10 @@ {% set reponame = 'stsynphot_refactor' %} {% set name = 'stsynphot' %} {% set version = '0.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ reponame }} @@ -20,10 +23,10 @@ requirements: - synphot >=0.1 - astropy >=1.3 - scipy >=0.14 - - numpy + - numpy {{ numpy }} - pytest - setuptools - - python x.x + - python {{ python }} run: - synphot >=0.1 @@ -31,7 +34,7 @@ requirements: - scipy >=0.14 - numpy - pytest - - python x.x + - python source: git_tag: {{ version }} diff --git a/stwcs/bld.bat b/stwcs/bld.bat index 2d6c912..39b5e1f 100644 --- a/stwcs/bld.bat +++ b/stwcs/bld.bat @@ -1,2 +1 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/stwcs/meta.yaml b/stwcs/meta.yaml index a9e5d8a..23e4d26 100644 --- a/stwcs/meta.yaml +++ b/stwcs/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stwcs' %} {% set version = '1.4.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} diff --git a/synphot/bld.bat b/synphot/bld.bat index 98bf5c5..39b5e1f 100644 --- a/synphot/bld.bat +++ b/synphot/bld.bat @@ -1,2 +1 @@ -python setup.py install || exit 1 -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/synphot/build.sh b/synphot/build.sh index 5c61be1..5a5aeeb 100644 --- a/synphot/build.sh +++ b/synphot/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/synphot/meta.yaml b/synphot/meta.yaml index 6b6ed1d..e7d31b5 100644 --- a/synphot/meta.yaml +++ b/synphot/meta.yaml @@ -1,7 +1,10 @@ {% set reponame = 'synphot_refactor' %} {% set name = 'synphot' %} {% set version = '0.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ reponame }} @@ -19,16 +22,16 @@ requirements: build: - astropy >=1.3 - scipy >=0.14 - - numpy + - numpy {{ numpy }} - pytest - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.3 - scipy >=0.14 - numpy - pytest - - python x.x + - python source: git_tag: {{ version }} diff --git a/template/meta.yaml b/template/meta.yaml index 8d53cc1..d1ac199 100644 --- a/template/meta.yaml +++ b/template/meta.yaml @@ -1,6 +1,9 @@ {% set name = '' %} {% set version = '' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: # Package homepage @@ -27,10 +30,10 @@ requirements: build: # Dependencies required at BUILD-TIME go here - setuptools - - python x.x + - python {{ python }} run: # Dependencies required at RUN-TIME go here - - python x.x + - python #test: # imports: diff --git a/threading2/bld.bat b/threading2/bld.bat deleted file mode 100644 index b290566..0000000 --- a/threading2/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/threading2/build.sh b/threading2/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/threading2/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/threading2/meta.yaml b/threading2/meta.yaml deleted file mode 100644 index 989d4bb..0000000 --- a/threading2/meta.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{% set name = 'threading2' %} -{% set version = '0.2.1' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/t/{{ name }} - license: BSD - summary: like the standard threading module, but awesomer - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 4ffb227b9a0e1f3e2a42f69f92a47bae - url: https://pypi.python.org/packages/source/t/{{ name }}/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - threading2 diff --git a/traceback2/bld.bat b/traceback2/bld.bat deleted file mode 100644 index b290566..0000000 --- a/traceback2/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/traceback2/build.sh b/traceback2/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/traceback2/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/traceback2/meta.yaml b/traceback2/meta.yaml deleted file mode 100644 index 2fa5df8..0000000 --- a/traceback2/meta.yaml +++ /dev/null @@ -1,37 +0,0 @@ -{% set name = 'traceback2' %} -{% set version = '1.4.0' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/t/{{ name }} - license: BSD - summary: Backports of the traceback module - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - pbr - - linecache2 - - six - - setuptools - - python x.x - run: - - pbr - - linecache2 - - six - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 9e9723f4d70bfc6308fa992dd193c400 - url: https://pypi.python.org/packages/source/t/{{ name }}/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - traceback2 diff --git a/verhawk/bld.bat b/verhawk/bld.bat index 2d6c912..39b5e1f 100644 --- a/verhawk/bld.bat +++ b/verhawk/bld.bat @@ -1,2 +1 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/verhawk/build.sh b/verhawk/build.sh index 5c61be1..5a5aeeb 100644 --- a/verhawk/build.sh +++ b/verhawk/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/verhawk/meta.yaml b/verhawk/meta.yaml index b98772a..691734a 100644 --- a/verhawk/meta.yaml +++ b/verhawk/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'verhawk' %} {% set version = '0.0.2' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://github.com/spacetelescope/{{ name }} @@ -17,9 +20,9 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: git_tag: {{ version }} diff --git a/wcstools/meta.yaml b/wcstools/meta.yaml index e7b3a51..9a2fa2e 100644 --- a/wcstools/meta.yaml +++ b/wcstools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'wcstools' %} {% set version = '3.9.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://tdc-www.harvard.edu/wcstools license: GPL diff --git a/webbpsf-data/meta.yaml b/webbpsf-data/meta.yaml index 0bcf730..9f02f24 100644 --- a/webbpsf-data/meta.yaml +++ b/webbpsf-data/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'webbpsf-data' %} {% set version = '0.6.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://webbpsf.readthedocs.io diff --git a/webbpsf/bld.bat b/webbpsf/bld.bat index b290566..760380e 100644 --- a/webbpsf/bld.bat +++ b/webbpsf/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/webbpsf/build.sh b/webbpsf/build.sh index 4b71885..56f0b30 100644 --- a/webbpsf/build.sh +++ b/webbpsf/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/webbpsf/meta.yaml b/webbpsf/meta.yaml index 859f352..e5e736c 100644 --- a/webbpsf/meta.yaml +++ b/webbpsf/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'webbpsf' %} {% set version = '0.6.0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://webbpsf.readthedocs.io @@ -20,14 +23,14 @@ package: requirements: build: - astropy >=1.1 - - numpy + - numpy {{ numpy }} - scipy - matplotlib - poppy >=0.6.1 - six [py27] - webbpsf-data ==0.6.0 - setuptools - - python x.x + - python {{ python }} - ipywidgets - jwxml run: @@ -39,7 +42,7 @@ requirements: - six [py27] - webbpsf-data ==0.6.0 - setuptools - - python x.x + - python - ipywidgets - jwxml diff --git a/wfc3tools/bld.bat b/wfc3tools/bld.bat index 2d6c912..39b5e1f 100644 --- a/wfc3tools/bld.bat +++ b/wfc3tools/bld.bat @@ -1,2 +1 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/wfc3tools/build.sh b/wfc3tools/build.sh index 5c61be1..5a5aeeb 100644 --- a/wfc3tools/build.sh +++ b/wfc3tools/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/wfc3tools/meta.yaml b/wfc3tools/meta.yaml index c5adfd6..ae60327 100644 --- a/wfc3tools/meta.yaml +++ b/wfc3tools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'wfc3tools' %} {% set version = '1.3.4' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -17,16 +20,16 @@ package: requirements: build: - astropy >=1.1 - - numpy + - numpy {{ numpy }} - setuptools - - python x.x + - python {{ python }} - matplotlib - scipy - stsci.tools run: - astropy >=1.1 - numpy - - python x.x + - python - stsci.tools - matplotlib - scipy diff --git a/wfpc2tools/bld.bat b/wfpc2tools/bld.bat index 695f708..39b5e1f 100644 --- a/wfpc2tools/bld.bat +++ b/wfpc2tools/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/wfpc2tools/build.sh b/wfpc2tools/build.sh index 5626890..5a5aeeb 100644 --- a/wfpc2tools/build.sh +++ b/wfpc2tools/build.sh @@ -1,29 +1 @@ - -function get_py_version() { -python --version 2>&1| awk '{sub(/-.*/,"",$2);print $2}' -} -export -f get_py_version - -function set_py3k() { - version=`get_py_version` - major=`echo $version | cut -d '.' -f 1` - minor=`echo $version | cut -d '.' -f 2` - hotfix=`echo $version | cut -d '.' -f 3` - if (( major > 2 )); then - export PY3K=1 - else - export PY3K=0 - fi -} -export -f set_py3k - -set_py3k - -pip install --no-deps --upgrade --force d2to1 || exit 1 - -echo "This doesn't work. Why conda why? --python 2.7 is useless here" -if [ $PY3K -ne 0 ] ; then -sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg -fi - -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/wfpc2tools/meta.yaml b/wfpc2tools/meta.yaml index 8cc9422..75e0d48 100644 --- a/wfpc2tools/meta.yaml +++ b/wfpc2tools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'wfpc2tools' %} {% set version = '1.0.3' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -24,15 +27,15 @@ requirements: - stsci.imagestats - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - scipy - stsci.imagestats - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/ws4py/bld.bat b/ws4py/bld.bat deleted file mode 100644 index b290566..0000000 --- a/ws4py/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/ws4py/build.sh b/ws4py/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/ws4py/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/ws4py/meta.yaml b/ws4py/meta.yaml deleted file mode 100644 index 67fe4d5..0000000 --- a/ws4py/meta.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{% set name = 'ws4py' %} -{% set version = '0.3.4' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/w/{{ name }} - license: BSD - summary: WebSocket client and server library for Python 2 and 3 as well as PyPy - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 6b47e33cbd13f5c134b04f2a44a480ad - url: https://pypi.python.org/packages/source/w/{{ name }}/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - ws4py diff --git a/xpa/meta.yaml b/xpa/meta.yaml index 3e0b4e7..0122b22 100644 --- a/xpa/meta.yaml +++ b/xpa/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'xpa' %} {% set version = '2.1.18' %} -{% set tag = 'v'+version %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set tag = 'v' + version %} +{% set number = '1' %} about: home: https://github.com/ericmandel/{{ name }} diff --git a/yolk/bld.bat b/yolk/bld.bat deleted file mode 100644 index b290566..0000000 --- a/yolk/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/yolk/build.sh b/yolk/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/yolk/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/yolk/meta.yaml b/yolk/meta.yaml deleted file mode 100644 index 97d3559..0000000 --- a/yolk/meta.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{% set name = 'yolk' %} -{% set version = '0.4.3' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/y/{{ name }} - license: BSD - summary: Command-line tool for querying PyPI and Python packages installed on your system - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - run: - - python x.x - -source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 10dfabca7a020058436aec9dbad70123 - url: https://pypi.python.org/packages/source/y/{{ name }}/{{ name }}-{{ version }}.tar.gz - -test: - commands: - - yolk -- cgit