diff options
author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2018-01-05 15:01:53 -0500 |
---|---|---|
committer | Matt Rendina <rendinam@users.noreply.github.com> | 2018-01-05 15:01:53 -0500 |
commit | 286c9d0cd069759d090007da647e78afdb937596 (patch) | |
tree | d418f7d652cc5de4fe638143c30549a4fe9267b6 | |
parent | 90e6679788b9b9f81ef2ec1bad0d7b255ab5300d (diff) | |
download | astroconda-dev-286c9d0cd069759d090007da647e78afdb937596.tar.gz |
[WIP] Next (#75)
* Purge x.x style selectors
* Add python jinja2 selectors
* Add numpy jinja2 selectors
* Add basic build matrix configuration
* Delete iraf package; see astroconda/astroconda-iraf
* Bump all build revisions
* Remove drizzlepac and nose dependencies
* Fixup dependencies
* Strip newlines in version declaration
* Implements new package versioning scheme
* Revert sandboxing
* Purge old or unnecessary packages
* Clean up meta-packages
* Use fake version
* Minor clean up
* Add missing md5 hashes
* Python is not a dependency of XPA
* Remove GIT_ usage in non-git recipe
* Initial commit of asteval
* cubeviz: sed patching glue/numpy/pytest
* Add missing curly braces
* Remove references to pywcs
* Add mosviz
* Fix up specutils
* Forcefully strip all "v" version prefixes. Please stop using them.
* Fix ginga
* Use PYTHON
* Remove d2to1 dep
* Remove d2to1 dep
* Remove d2to1 dep
* Remove d2to1 dep
* Remove deprecated JWST pipeline packages
* Simplify python builds
* Simplify python builds (windows)
* Remove d2to1 dep
* Remove d2to1 dep
* Stop using 2to3
* Remove ATLAS
* Move sextractor to mainline
* Sextractor Intel MKL integration patches (i.e NO ATLAS)
317 files changed, 1202 insertions, 2043 deletions
diff --git a/acstools/bld.bat b/acstools/bld.bat index 726b367..7fba400 100644 --- a/acstools/bld.bat +++ b/acstools/bld.bat @@ -1,5 +1,3 @@ -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/acstools/build.sh b/acstools/build.sh index 4b71885..6bd6081 100644 --- a/acstools/build.sh +++ b/acstools/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/acstools/meta.yaml b/acstools/meta.yaml index e87be19..47b8bb2 100644 --- a/acstools/meta.yaml +++ b/acstools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'acstools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,13 +20,13 @@ package: requirements: build: - 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/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 4bfaad9..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/appdirs/{{ 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..6bd6081 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 diff --git a/aprio/meta.yaml b/aprio/meta.yaml index 9a7f230..2275615 100644 --- a/aprio/meta.yaml +++ b/aprio/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'aprio' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://bitbucket.org/jhunkeler/{{ name }} @@ -23,13 +24,13 @@ requirements: - psutil - python-daemon - setuptools - - python x.x + - python run: - docutils - psutil - python-daemon - - python x.x + - python source: git_url: https://bitbucket.org/jhunkeler/{{ name }}.git 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..6bd6081 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 diff --git a/asdf-standard/meta.yaml b/asdf-standard/meta.yaml index 36d640a..97f35c9 100644 --- a/asdf-standard/meta.yaml +++ b/asdf-standard/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'asdf-standard' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -24,13 +25,13 @@ requirements: - mistune - six [py27|py3k] - setuptools - - python x.x - + - python {{ python }} + run: - nose - astropy - setuptools - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/asdf/bld.bat b/asdf/bld.bat index b290566..760380e 100644 --- a/asdf/bld.bat +++ b/asdf/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/build.sh b/asdf/build.sh index 4b71885..6bd6081 100644 --- a/asdf/build.sh +++ b/asdf/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/asdf/meta.yaml b/asdf/meta.yaml index 53eae63..a6fd632 100644 --- a/asdf/meta.yaml +++ b/asdf/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'asdf' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -25,8 +26,8 @@ requirements: - semantic_version >=2.6.0 - six - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy @@ -37,7 +38,7 @@ requirements: - six - setuptools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/asteval/meta.yaml b/asteval/meta.yaml new file mode 100644 index 0000000..b387816 --- /dev/null +++ b/asteval/meta.yaml @@ -0,0 +1,60 @@ +{% set name = "asteval" %} +{% set version = "0.9.11" %} +{% set file_ext = "tar.gz" %} +{% set hash_type = "sha256" %} +{% set hash_value = "5995f1863c1685cd00df010663c15be880035a38b1e58c6340fb1d3adc499d8e" %} + +package: + name: '{{ name|lower }}' + version: '{{ version }}' + +source: + fn: '{{ name }}-{{ version }}.{{ file_ext }}' + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.{{ file_ext }} + '{{ hash_type }}': '{{ hash_value }}' + +build: + number: 0 + script: python setup.py install --single-version-externally-managed --record=record.txt + +requirements: + host: + - python {{ python }} + - setuptools + - numpy {{ numpy }} + - six + run: + - python + - numpy + - six + +test: + imports: + - asteval + +about: + home: http://github.com/newville/asteval + license: BSD License + license_family: BSD + license_file: '' + summary: Safe, minimalistic evaluator of python expression using ast module + description: 'ASTEVAL provides a numpy-aware, safe(ish) ''eval'' function + + + Emphasis is on mathematical expressions, and so numpy ufuncs + + are used if available. Symbols are held in the Interpreter + + symbol table ''symtable'': a simple dictionary supporting a + + simple, flat namespace. + + + Expressions can be compiled into ast node for later evaluation, + + using the values in the symbol table current at evaluation time.' + doc_url: '' + dev_url: '' + +extra: + recipe-maintainers: '' diff --git a/astroimtools/bld.bat b/astroimtools/bld.bat index c50c85a..760380e 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 diff --git a/astroimtools/build.sh b/astroimtools/build.sh index b875087..6bd6081 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 diff --git a/astroimtools/meta.yaml b/astroimtools/meta.yaml index 7e0cf80..9e1c029 100644 --- a/astroimtools/meta.yaml +++ b/astroimtools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'astroimtools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,15 +23,15 @@ requirements: - cython - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - cython - matplotlib - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/astrolib.coords/bld.bat b/astrolib.coords/bld.bat deleted file mode 100644 index 5d42b68..0000000 --- a/astrolib.coords/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/astrolib.coords/build.sh b/astrolib.coords/build.sh deleted file mode 100644 index c5199fc..0000000 --- a/astrolib.coords/build.sh +++ /dev/null @@ -1,3 +0,0 @@ - -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 e489d5e..0000000 --- a/astrolib.coords/meta.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{% set name = 'astrolib.coords' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} - -about: - home: https://github.com/spacetelescope/{{ name }} - license: BSD - summary: astrolib.coords - -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_url: https://github.com/spacetelescope/{{ name }}.git - -test: - imports: - - astrolib.coords diff --git a/astropy/bld.bat b/astropy/bld.bat index c50c85a..760380e 100644 --- a/astropy/bld.bat +++ b/astropy/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 diff --git a/astropy/build.sh b/astropy/build.sh index 762d43b..5a5aeeb 100644 --- a/astropy/build.sh +++ b/astropy/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/astropy/meta.yaml b/astropy/meta.yaml index 1844182..dc1c88b 100644 --- a/astropy/meta.yaml +++ b/astropy/meta.yaml @@ -1,6 +1,10 @@ {% set name = 'astropy' %} -{% set version = '3.0.dev' + environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = "3.0.0.dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set commit = '76c58d4b8d7baa6641a114c3927b2464805e1a09' %} +{% set number = '1' %} about: home: https://github.com/astropy/{{ name }} @@ -8,7 +12,7 @@ about: summary: Astropy is a package intended to contain much of the core functionality and some common tools needed for performing astronomy and astrophysics with Python. build: - skip: True [py27] + skip: True [py27 or py33 or py34] number: {{ number }} package: @@ -21,12 +25,11 @@ requirements: - jinja2 - pytest - setuptools - - numpy x.x - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - - beautiful-soup [py27 or py34] - - beautifulsoup4 [py>=35] + - beautifulsoup4 - cython - h5py - ipython @@ -39,10 +42,11 @@ requirements: - pyyaml - scikit-image - scipy - - numpy x.x - - python x.x + - numpy + - python source: + git_rev: {{ commit }} git_url: https://github.com/astropy/{{ name }}.git test: @@ -56,3 +60,4 @@ test: - wcslint --help imports: - astropy + diff --git a/astroquery/bld.bat b/astroquery/bld.bat index 85a7bc3..39b5e1f 100644 --- a/astroquery/bld.bat +++ b/astroquery/bld.bat @@ -1,2 +1 @@ %PYTHON% setup.py install -if errorlevel 1 exit 1 diff --git a/astroquery/meta.yaml b/astroquery/meta.yaml index 9966388..02f3c5e 100644 --- a/astroquery/meta.yaml +++ b/astroquery/meta.yaml @@ -1,11 +1,9 @@ {% set name = 'astroquery' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} {% if version[0] == 'v' %} -{% set version = version[1:] %} +{% set version = version[1:] %} {% endif %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/astropy/{{ name }} @@ -31,7 +29,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..a54269f 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 diff --git a/asv/meta.yaml b/asv/meta.yaml index ec0fbcb..19fd791 100644 --- a/asv/meta.yaml +++ b/asv/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'asv' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,14 +22,14 @@ requirements: - six - sphinx - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - six - sphinx - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git 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 535529d..6bd6081 100644 --- a/calcos/build.sh +++ b/calcos/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/calcos/meta.yaml b/calcos/meta.yaml index cf105e7..2e4b7fd 100644 --- a/calcos/meta.yaml +++ b/calcos/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'calcos' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '2' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '3' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,15 +24,15 @@ requirements: - scipy - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - scipy - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/cfitsio/bld.bat b/cfitsio/bld.bat index 63c6954..db081d9 100644 --- a/cfitsio/bld.bat +++ b/cfitsio/bld.bat @@ -1,3 +1,3 @@ echo Not supported. -exit 1
\ No newline at end of file +exit 1 diff --git a/cfitsio/build.sh b/cfitsio/build.sh index 4902a84..5368e6b 100644 --- a/cfitsio/build.sh +++ b/cfitsio/build.sh @@ -4,4 +4,5 @@ case "$(uname)" in ;; esac ./configure --prefix=$PREFIX --disable-static --enable-reentrant -(make -j $CPU_COUNT shared && make install) || exit 1 +make -j $CPU_COUNT shared +make install diff --git a/cfitsio/meta.yaml b/cfitsio/meta.yaml index 65d5305..bbfc4b8 100644 --- a/cfitsio/meta.yaml +++ b/cfitsio/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'cfitsio' %} {% set version = '3.410' %} {% set version_short = '3410' %} -{% set number = '1' %} +{% set number = '2' %} about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html @@ -24,3 +24,4 @@ requirements: source: fn: {{ name }}{{ version_short }}.tar.gz url: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/{{ name }}{{ version_short }}.tar.gz + md5: 9c7e34741bdff85768c82aa8326b3664 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 726b367..7fba400 100644 --- a/costools/bld.bat +++ b/costools/bld.bat @@ -1,5 +1,3 @@ -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 4b71885..6bd6081 100644 --- a/costools/build.sh +++ b/costools/build.sh @@ -1,2 +1,2 @@ -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 5fd6295..4f0755c 100644 --- a/costools/meta.yaml +++ b/costools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'costools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: http://www.stsci.edu/institute/software_hardware @@ -24,8 +25,8 @@ requirements: - calcos - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - d2to1 @@ -34,7 +35,7 @@ requirements: - stsci.tools - setuptools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git 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 a27232a..3504da4 100644 --- a/crds/meta.yaml +++ b/crds/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'crds' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://www.stsci.edu/hst/observatory/crds/ @@ -23,13 +24,13 @@ requirements: build: - astropy >=1.1 - cfitsio - - numpy + - numpy {{ numpy }} - requests - lxml - parsley - lockfile - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.1 @@ -40,7 +41,7 @@ requirements: - fitsverify - parsley - lockfile - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/cubeviz/bld.bat b/cubeviz/bld.bat index b290566..760380e 100644 --- a/cubeviz/bld.bat +++ b/cubeviz/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/cubeviz/build.sh b/cubeviz/build.sh index 14c64d7..51994e4 100644 --- a/cubeviz/build.sh +++ b/cubeviz/build.sh @@ -1,8 +1,11 @@ # Replace malformed pytest requirement with something sane -pytest_pattern='s/pytest==*/pytest>=3.1.0/' +pytest_pattern='s/pytest==/pytest>=/' +glue_pattern='s/glueviz//' +numpy_pattern='s|numpy>=1.13|numpy>=1.12|' + for f in setup.* do - sed -e ${pytest_pattern} "${f}" > "${f}.new" + sed -e ${pytest_pattern} -e ${glue_pattern} -e ${numpy_pattern} "${f}" > "${f}.new" mv "${f}.new" "${f}" done diff --git a/cubeviz/meta.yaml b/cubeviz/meta.yaml index d6eb520..2bfb0d2 100644 --- a/cubeviz/meta.yaml +++ b/cubeviz/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'cubeviz' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,17 +20,21 @@ package: requirements: build: - asdf + - asteval - astropy - - numpy - - pytest >=3.1* + - glueviz + - numpy {{ numpy }} + - pytest - setuptools - - python + - python {{ python }} run: - asdf + - asteval - astropy + - glueviz - numpy - - pytest >=3.1* + - pytest - python source: diff --git a/d2to1/bld.bat b/d2to1/bld.bat index b290566..760380e 100644 --- a/d2to1/bld.bat +++ b/d2to1/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/d2to1/build.sh b/d2to1/build.sh index 4b71885..6bd6081 100644 --- a/d2to1/build.sh +++ b/d2to1/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/d2to1/meta.yaml b/d2to1/meta.yaml index 8ea7776..fe44630 100644 --- a/d2to1/meta.yaml +++ b/d2to1/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'd2to1' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/embray/{{ name }} @@ -19,11 +20,11 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - setuptools - - python x.x + - python source: git_url: https://github.com/embray/{{ name }}.git diff --git a/dbus-glib/meta.yaml b/dbus-glib/meta.yaml index 780ca3d..500be6f 100644 --- a/dbus-glib/meta.yaml +++ b/dbus-glib/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'dbus-glib' %} {% set version = '0.108' %} -{% set number = '0' %} +{% set number = '1' %} {% set archive = name + '-' + version + '.tar.gz' %} package: @@ -28,3 +28,4 @@ requirements: source: fn: {{ archive }} url: https://dbus.freedesktop.org/releases/{{ name }}/{{ archive }} + md5: a66a613705870752ca9786e0359aea97 diff --git a/dbus-python/meta.yaml b/dbus-python/meta.yaml index 8e2b78d..e4d6e83 100644 --- a/dbus-python/meta.yaml +++ b/dbus-python/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'dbus-python' %} {% set version = '1.2.4' %} -{% set number = '0' %} +{% set number = '1' %} {% set archive = name + '-' + version + '.tar.gz' %} about: @@ -19,6 +19,7 @@ build: source: fn: {{ archive }} url: https://dbus.freedesktop.org/releases/{{ name }}/{{ archive }} + md5: 7372a588c83a7232b4e08159bfd48fe5 requirements: build: @@ -27,7 +28,7 @@ requirements: - dbus - dbus-glib - setuptools - - python + - python {{ python }} run: - dbus diff --git a/decorators/bld.bat b/decorators/bld.bat index b290566..760380e 100644 --- a/decorators/bld.bat +++ b/decorators/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/decorators/build.sh b/decorators/build.sh index 4b71885..6bd6081 100644 --- a/decorators/build.sh +++ b/decorators/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/decorators/meta.yaml b/decorators/meta.yaml index 11e7987..ad7fdda 100644 --- a/decorators/meta.yaml +++ b/decorators/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'decorators' %} {% set version = '0.1' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/micheles/decorator @@ -17,10 +17,10 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz 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 9bce9e2..547f344 100644 --- a/drizzle/meta.yaml +++ b/drizzle/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'drizzle' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -20,13 +21,13 @@ requirements: build: - astropy - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat index 726b367..7fba400 100644 --- a/drizzlepac/bld.bat +++ b/drizzlepac/bld.bat @@ -1,5 +1,3 @@ -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 63d76ee..9b298cd 100644 --- a/drizzlepac/build.sh +++ b/drizzlepac/build.sh @@ -1,3 +1,3 @@ test -f setup.cfg && sed -i -e '/astrolib\.coords.*/d' setup.cfg -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml index d44d09c..27b9afd 100644 --- a/drizzlepac/meta.yaml +++ b/drizzlepac/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'drizzlepac' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/drizzlepac.git @@ -35,8 +36,8 @@ requirements: - stwcs - pyregion - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy @@ -55,7 +56,7 @@ requirements: - pyregion - setuptools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git 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 eb647cd..0d609a5 100644 --- a/ds9/meta.yaml +++ b/ds9/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'ds9' %} {% set version = '7.5' %} -{% set number = '1' %} +{% set number = '2' %} about: home: http://ds9.si.edu/download/source/ @@ -20,6 +20,5 @@ requirements: source: fn: {{ name }}.{{ version }}.tar.gz - url: - - http://ds9.si.edu/download/source/{{ 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 c0b264c..0000000 --- a/ext_shmht/meta.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{% set name = 'ext_shmht' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} - -about: - home: https://github.com/stsci-ssb/{{ name }} - license: BSD - summary: ext_shmht - -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/bld.bat b/fftw/bld.bat index 95a6a85..3dd9db3 100644 --- a/fftw/bld.bat +++ b/fftw/bld.bat @@ -1,2 +1,2 @@ -echo Unsupported
\ No newline at end of file +echo Unsupported diff --git a/fftw/build.sh b/fftw/build.sh index 3cad563..b89c0c2 100644 --- a/fftw/build.sh +++ b/fftw/build.sh @@ -1,14 +1,14 @@ - +set -e export modes="--enable-single --enable-long-double" export FFTW_CONFIGURE="./configure --prefix=$PREFIX --disable-static --enable-shared --enable-threads " 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 -for mode in $modes; do fftw_build $mode; done
\ No newline at end of file +for mode in $modes; do fftw_build $mode; done diff --git a/fftw/meta.yaml b/fftw/meta.yaml index ce33a57..94ca4a5 100644 --- a/fftw/meta.yaml +++ b/fftw/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'fftw' %} {% set version = '3.3.4' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://www.fftw.org @@ -24,3 +24,4 @@ requirements: source: fn: {{ name }}-{{ version }}.tar.gz url: http://www.fftw.org/{{ name }}-{{ version }}.tar.gz + md5: 2edab8c06b24feeb3b82bbb3ebf3e7b3 diff --git a/fitsblender/bld.bat b/fitsblender/bld.bat index 976d3b9..7fba400 100644 --- a/fitsblender/bld.bat +++ b/fitsblender/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/fitsblender/build.sh b/fitsblender/build.sh index 10954df..9104e24 100644 --- a/fitsblender/build.sh +++ b/fitsblender/build.sh @@ -1,3 +1,3 @@ -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 04ee992..1eb03a3 100644 --- a/fitsblender/meta.yaml +++ b/fitsblender/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'fitsblender' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: http://github.com/spacetelescope/{{ name }} @@ -23,14 +24,14 @@ requirements: - astropy - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/fitsverify/meta.yaml b/fitsverify/meta.yaml index 846c5c7..ddf30f6 100644 --- a/fitsverify/meta.yaml +++ b/fitsverify/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'fitsverify' %} {% set version = '4.18' %} -{% set number = '3' %} +{% set number = '4' %} # number = 1 ; legacy, links against whatever is provided by available cfitsio package # number = 2 ; links against cfitsio < 3.410 # number = 3 ; links against cfitsio >= 3.410 @@ -31,6 +31,7 @@ requirements: source: fn: {{ name }}-{{ version }}.tar.gz url: https://heasarc.gsfc.nasa.gov/docs/software/ftools/{{ name }}/{{ name }}-{{ version }}.tar.gz + md5: 84f2930e802891392043cb8a6cbf4d5d test: commands: diff --git a/freetds/bld.bat b/freetds/bld.bat index 325d862..fc7eb41 100644 --- a/freetds/bld.bat +++ b/freetds/bld.bat @@ -7,8 +7,6 @@ cmake -G "%CMAKE_GENERATOR%" ^ -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ -DCMAKE_BUILD_TYPE=Release ^ -DBUILD_SHARED_LIBS=True .. -if errorlevel 1 exit 1 cmake --build . --config Release --target all cmake --build . --config Release --target install -if errorlevel 1 exit 1 diff --git a/freetds/meta.yaml b/freetds/meta.yaml index 7f3afd0..33d7814 100644 --- a/freetds/meta.yaml +++ b/freetds/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'freetds' %} {% set version = '1.00.9' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://www.freetds.org/index.html diff --git a/ginga/bld.bat b/ginga/bld.bat index b290566..39b5e1f 100644 --- a/ginga/bld.bat +++ b/ginga/bld.bat @@ -1,3 +1 @@ - -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..8c640a4 100644 --- a/ginga/build.sh +++ b/ginga/build.sh @@ -1,3 +1,4 @@ - +# README has invalid unicode characters echo > README.txt -python setup.py install || exit 1
\ No newline at end of file + +$PYTHON setup.py install diff --git a/ginga/meta.yaml b/ginga/meta.yaml index 470f6bc..be744ad 100644 --- a/ginga/meta.yaml +++ b/ginga/meta.yaml @@ -1,11 +1,14 @@ {% set name = 'ginga' %} -{% set version = '2.5.20151215011852' %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '0' %} about: - home: https://github.com/ejeschke/ginga + home: https://github.com/ejeschke/{{ name }} license: BSD - summary: ginga + summary: Astronomical data visualization build: number: {{ number }} @@ -16,18 +19,24 @@ package: requirements: build: - - numpy + - astropy + - qtpy + - pillow - setuptools - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: + - astropy + - qtpy + - pillow - numpy - - python x.x + - python source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 11cd8b9ed459c4438cc827e0a1ca4538 - url: https://pypi.python.org/packages/source/g/ginga/{{ name }}-{{ version }}.tar.gz + git_url: https://github.com/ejeschke/{{ name }}.git test: + commands: + - ginga --help imports: - ginga diff --git a/glue-vispy-viewers/meta.yaml b/glue-vispy-viewers/meta.yaml index ebb5183..bcd35e3 100644 --- a/glue-vispy-viewers/meta.yaml +++ b/glue-vispy-viewers/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'glue-vispy-viewers' %} {% set version = '0.4' %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/glue-viz/glue-vispy-viewers @@ -22,12 +22,12 @@ build: requirements: build: - - python + - python {{ python }} - setuptools run: - python - - numpy + - numpy {{ numpy }} - pyopengl - glueviz - scikit-image diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index 29e2b67..e1e5848 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'glueviz' %} {% set version = '0.8.2' %} -{% set number = '1' %} +{% set number = '2' %} package: name: {{ name }} @@ -18,11 +18,11 @@ build: requirements: build: - - python + - python {{ python }} run: - python - - numpy + - numpy {{ numpy }} - scipy - matplotlib - astropy 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..6bd6081 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 diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index 8417966..a5b2746 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'gwcs' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,14 +22,14 @@ requirements: - asdf - astropy - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - asdf - astropy - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/hstcal/bld.bat b/hstcal/bld.bat index 78e717d..6776c93 100644 --- a/hstcal/bld.bat +++ b/hstcal/bld.bat @@ -1,3 +1,3 @@ echo Not yet. -exit 1
\ No newline at end of file +exit 1 diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml index 955d36b..a891b0b 100644 --- a/hstcal/meta.yaml +++ b/hstcal/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'hstcal' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} 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..6bd6081 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 diff --git a/htc_utils/meta.yaml b/htc_utils/meta.yaml index 0c8335e..3035292 100644 --- a/htc_utils/meta.yaml +++ b/htc_utils/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'htc_utils' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/jhunkeler/{{ name }} @@ -20,11 +21,11 @@ requirements: build: - argparse [py26] - setuptools - - python x.x + - python {{ python }} run: - argparse [py26] - - python x.x + - python source: git_url: https://github.com/jhunkeler/{{ name }}.git diff --git a/imexam/bld.bat b/imexam/bld.bat index f300b17..39b5e1f 100644 --- a/imexam/bld.bat +++ b/imexam/bld.bat @@ -1,7 +1 @@ - -pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 -pip install --no-deps --upgrade --force astropy_helpers || exit 1 -if errorlevel 1 exit 1 -python setup.py install --offline -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/imexam/build.sh b/imexam/build.sh index 70f3a36..5a5aeeb 100644 --- a/imexam/build.sh +++ b/imexam/build.sh @@ -1,7 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 || exit 1 -pip install --no-deps --upgrade --force astropy_helpers || exit 1 -sed -i -e 's|find-links|#find-links|g' setup.cfg -sed -i -e 's|auto_use|#auto_use|g' setup.cfg -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/imexam/meta.yaml b/imexam/meta.yaml index 4a35a8a..6d586da 100644 --- a/imexam/meta.yaml +++ b/imexam/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'imexam' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,18 +19,16 @@ package: requirements: build: - - d2to1 - - stsci.distutils - nose - astropy - - numpy + - numpy {{ numpy }} - scipy - cython - matplotlib - ipython - setuptools - mock [py27] - - python x.x + - python {{ python }} run: - nose @@ -40,7 +39,7 @@ requirements: - matplotlib - ipython - mock [py27] - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/imgeom/meta.yaml b/imgeom/meta.yaml index 0ad76fd..592bf41 100644 --- a/imgeom/meta.yaml +++ b/imgeom/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'imgeom' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -25,14 +26,14 @@ requirements: - drizzle - gwcs - setuptools - - python x.x + - python {{ python }} run: - astropy - drizzle - gwcs - - numpy - - python x.x + - numpy {{ numpy }} + - python test: imports: 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 f58801a..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. This is not supposed to happen." -;; - -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 f2e08fd..0000000 --- a/iraf/meta.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{% set name = 'iraf' %} -{% set version = '2.16.1' %} -{% set number = '2' %} - -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: iraf.tar.gz - url: - - http://ssb.stsci.edu/stripped/linux/iraf.tar.gz [linux] - - http://ssb.stsci.edu/stripped/osx/iraf.tar.gz [osx] diff --git a/jplephem/bld.bat b/jplephem/bld.bat index 762d43b..39b5e1f 100644 --- a/jplephem/bld.bat +++ b/jplephem/bld.bat @@ -1 +1 @@ -python setup.py install +%PYTHON% setup.py install diff --git a/jplephem/meta.yaml b/jplephem/meta.yaml index 50d2b9f..5cad565 100644 --- a/jplephem/meta.yaml +++ b/jplephem/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'jplephem' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/brandon-rhodes/python-{{ name }} @@ -19,12 +20,12 @@ package: requirements: build: - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - numpy - - python x.x + - python source: git_url: https://github.com/brandon-rhodes/python-{{ name }}.git diff --git a/jwst/meta.yaml b/jwst/meta.yaml index ad23e4b..91f0c81 100644 --- a/jwst/meta.yaml +++ b/jwst/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'jwst' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/stsci-jwst/{{ name }} @@ -10,8 +11,9 @@ about: summary: JWST Pipeline code build: + skip: True [py27] number: {{ number }} - preserve_egg_dir: 'True' + preserve_egg_dir: True package: name: {{ name }} @@ -22,9 +24,10 @@ requirements: - astropy - matplotlib - namedlist - - numpy >=1.7* + - pymssql [not py36] - setuptools - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - asdf @@ -32,20 +35,24 @@ requirements: - crds - dask - drizzle - - drizzlepac + - fitsblender - gwcs - jsonschema - jplephem - matplotlib - namedlist - - nose - photutils - - pymssql + - pymssql [not py36] - scipy - six + - stsci.image + - stsci.imagestats + - stsci.sphere + - stsci.stimage + - stsci.tools - verhawk - - numpy >=1.7* - - python x.x + - numpy + - python source: git_url: https://github.com/stsci-jwst/{{ name }}.git diff --git a/jwst_gtvt/meta.yaml b/jwst_gtvt/meta.yaml index b3931d4..ae4d1d5 100644 --- a/jwst_gtvt/meta.yaml +++ b/jwst_gtvt/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'jwst_gtvt' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,9 +23,9 @@ requirements: build: - astropy - matplotlib - - numpy + - numpy {{ numpy }} - setuptools - - python + - python {{ python }} run: - astropy diff --git a/jwst_lib/bld.bat b/jwst_lib/bld.bat deleted file mode 100644 index 21d698d..0000000 --- a/jwst_lib/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -echo "Unsupported (yet?)"
\ No newline at end of file diff --git a/jwst_lib/build.sh b/jwst_lib/build.sh deleted file mode 100644 index 1b0b189..0000000 --- a/jwst_lib/build.sh +++ /dev/null @@ -1,12 +0,0 @@ - -pip install --no-deps --force --upgrade d2to1 -for d in jwst_lib/* -do - case "$d" in - # Append deprecated packages here to disable them - */modeling) continue ;; - */wcs) continue ;; - *) echo "Processing package: $d" ;; - esac - ( cd $d && python setup.py install || exit 1 ) -done diff --git a/jwst_lib/meta.yaml b/jwst_lib/meta.yaml deleted file mode 100644 index 58a83c4..0000000 --- a/jwst_lib/meta.yaml +++ /dev/null @@ -1,51 +0,0 @@ -{% set name = 'jwst_lib' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} - -about: - home: ssh://git@bitbucket.org/stsci_ssb/jwst.git - license: BSD - summary: jwst_lib - -build: - number: {{ number }} - preserve_egg_dir: 'True' - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - d2to1 - - asdf - - astropy - - crds - - gwcs - - jsonschema - - nose - - six - - stsci.distutils - - numpy - - setuptools - - python x.x - - run: - - asdf - - astropy - - crds - - gwcs - - nose - - jsonschema - - six - - numpy - - python x.x - -source: - git_url: ssh://git@bitbucket.org/stsci_ssb/jwst.git - -test: - imports: - - jwst_lib diff --git a/jwst_pipeline/bld.bat b/jwst_pipeline/bld.bat deleted file mode 100644 index 21d698d..0000000 --- a/jwst_pipeline/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -echo "Unsupported (yet?)"
\ No newline at end of file diff --git a/jwst_pipeline/build.sh b/jwst_pipeline/build.sh deleted file mode 100644 index fb8181c..0000000 --- a/jwst_pipeline/build.sh +++ /dev/null @@ -1,6 +0,0 @@ - -pip install --no-deps --force --upgrade d2to1 -for d in jwst_pipeline/* -do -( cd $d && python setup.py install || exit 1 ) -done diff --git a/jwst_pipeline/meta.yaml b/jwst_pipeline/meta.yaml deleted file mode 100644 index 5dbfc4d..0000000 --- a/jwst_pipeline/meta.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{% set name = 'jwst_pipeline' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '2' %} - -about: - home: ssh://git@bitbucket.org/stsci_ssb/jwst.git - license: BSD - summary: jwst_pipeline - -build: - number: {{ number }} - preserve_egg_dir: 'True' - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - d2to1 - - astropy - - asdf - - crds - - cython - - dask - - drizzle - - drizzlepac - - gwcs - - jwst_lib - - matplotlib - - photutils - - scipy - - stsci.distutils - - setuptools - - numpy - - python x.x - - run: - - astropy - - asdf - - crds - - cython - - dask - - drizzle - - drizzlepac - - gwcs - - jwst_lib - - matplotlib - - photutils - - scipy - - numpy - - python x.x - -source: - git_url: ssh://git@bitbucket.org/stsci_ssb/jwst.git - -test: - imports: - - jwst_pipeline diff --git a/jwst_tools/bld.bat b/jwst_tools/bld.bat deleted file mode 100644 index 21d698d..0000000 --- a/jwst_tools/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -echo "Unsupported (yet?)"
\ No newline at end of file diff --git a/jwst_tools/build.sh b/jwst_tools/build.sh deleted file mode 100644 index 9b058f8..0000000 --- a/jwst_tools/build.sh +++ /dev/null @@ -1,6 +0,0 @@ - -pip install --no-deps --force --upgrade d2to1 -for d in jwst_tools/* -do - ( cd $d && python setup.py install || exit 1 ) -done diff --git a/jwst_tools/meta.yaml b/jwst_tools/meta.yaml deleted file mode 100644 index 1fa0160..0000000 --- a/jwst_tools/meta.yaml +++ /dev/null @@ -1,51 +0,0 @@ -{% set name = 'jwst_tools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} - -about: - home: ssh://git@bitbucket.org/stsci_ssb/jwst.git - license: BSD - summary: jwst_tools - -build: - number: {{ number }} - preserve_egg_dir: 'True' - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - d2to1 - - astropy - - jwst_lib - - matplotlib - - nose - - scipy - - six - - stsci.distutils - - stsci.tools - - setuptools - - numpy - - python x.x - - run: - - astropy - - jwst_lib - - matplotlib - - nose - - scipy - - six - - stsci.tools - - numpy - - python x.x - -source: - git_url: ssh://git@bitbucket.org/stsci_ssb/jwst.git - -test: - imports: - - jwst_tools 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 4c1399e..bc991ee 100644 --- a/jwxml/meta.yaml +++ b/jwxml/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'jwxml' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '2' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '3' %} about: home: https://github.com/mperrin/{{ name }} @@ -19,13 +20,13 @@ package: requirements: build: - - numpy + - numpy {{ numpy }} - matplotlib - - python x.x + - python {{ python }} run: - numpy - matplotlib - - python x.x + - python source: git_url: https://github.com/mperrin/{{ name }}.git 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 a54e090..0000000 --- a/lapack/meta.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{% set name = 'lapack' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} - -about: - home: http://www.netlib.org - license: BSD - summary: lapack - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - cmake - -source: - fn: {{ name }}-{{ version }}.tgz - url: http://www.netlib.org/lapack/{{ name }}-{{ version }}.tgz diff --git a/largepacks/atlas-generic/bld.bat b/largepacks/atlas-generic/bld.bat deleted file mode 100644 index bea6315..0000000 --- a/largepacks/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/largepacks/atlas-generic/build.sh b/largepacks/atlas-generic/build.sh deleted file mode 100644 index ce5d3eb..0000000 --- a/largepacks/atlas-generic/build.sh +++ /dev/null @@ -1,35 +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 -export OPTIONS="-C agc $CC -C if $F77 --shared -t 2 -b 64 -V 128 -A 12" -;; -Linux) -export CC=/usr/bin/gcc -export F77=/usr/bin/gfortran -export OPTIONS="-C agc $CC -C if $F77 --shared -t 2 -b 64 -V 128 -A 12" -;; -*) -;; -esac - -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 -make install - -popd
\ No newline at end of file diff --git a/largepacks/atlas-generic/meta.yaml b/largepacks/atlas-generic/meta.yaml deleted file mode 100644 index e3dd738..0000000 --- a/largepacks/atlas-generic/meta.yaml +++ /dev/null @@ -1,17 +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: atlas-generic -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/largepacks/sextractor-generic/bld.bat b/largepacks/sextractor-generic/bld.bat deleted file mode 100644 index 95a6a85..0000000 --- a/largepacks/sextractor-generic/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -echo Unsupported
\ No newline at end of file diff --git a/largepacks/sextractor-generic/build.sh b/largepacks/sextractor-generic/build.sh deleted file mode 100644 index 59c06c0..0000000 --- a/largepacks/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/largepacks/sextractor-generic/meta.yaml b/largepacks/sextractor-generic/meta.yaml deleted file mode 100644 index 0445f24..0000000 --- a/largepacks/sextractor-generic/meta.yaml +++ /dev/null @@ -1,25 +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: sextractor-generic -build: - number: {{ number }} -package: - name: {{ name }} - version: {{ version }} -requirements: - build: - - fftw - - pkgconfig - - atlas-generic [osx] - run: - - fftw - - atlas-generic [osx] -source: - fn: sextractor-2.19.5.tar.gz - url: - - http://www.astromatic.net/download/sextractor/sextractor-2.19.5.tar.gz diff --git a/largepacks/sextractor/bld.bat b/largepacks/sextractor/bld.bat deleted file mode 100644 index 95a6a85..0000000 --- a/largepacks/sextractor/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -echo Unsupported
\ No newline at end of file diff --git a/largepacks/sextractor/build.sh b/largepacks/sextractor/build.sh deleted file mode 100644 index 937f3d9..0000000 --- a/largepacks/sextractor/build.sh +++ /dev/null @@ -1,34 +0,0 @@ - -ATLAS=/usr -LIBDIR=lib -OPTIONS= -case $(uname) in -Linux) -if [[ $(uname -m) == *x86_64* ]]; then -LIBDIR=lib64/atlas -else -LIBDIR=lib/atlas -fi -export OPTIONS="--with-atlas-libdir=$PREFIX/lib --with-atlas-incdir=$PREFIX/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 - - -ATLAS=/usr/local/atlas -export OPTIONS="--enable-accelerate" -autoconf -autoheader -;; -*) -;; -esac - -./configure --prefix=$PREFIX \ ---with-fftw-libdir=$PREFIX/lib \ ---with-fftw-incdir=$PREFIX/include \ -"${OPTIONS}" - -make -j ${CPU_COUNT} -make install
\ No newline at end of file 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 17b01bb..0000000 --- a/linecache2/meta.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{% set name = 'linecache2' %} -{% set version = '1.0.0' %} -{% set number = '0' %} - -about: - home: https://pypi.python.org/packages/source/l/linecache2 - license: BSD - summary: linecache2 - -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/linecache2/{{ 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 9a6cb71..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: mechanize - -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/mechanize/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - mechanize diff --git a/mosviz/bld.bat b/mosviz/bld.bat new file mode 100644 index 0000000..39b5e1f --- /dev/null +++ b/mosviz/bld.bat @@ -0,0 +1 @@ +%PYTHON% setup.py install diff --git a/mosviz/build.sh b/mosviz/build.sh new file mode 100644 index 0000000..2291246 --- /dev/null +++ b/mosviz/build.sh @@ -0,0 +1,5 @@ +# 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 new file mode 100644 index 0000000..5deea70 --- /dev/null +++ b/mosviz/meta.yaml @@ -0,0 +1,47 @@ +{% set name = 'mosviz' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '0' %} + +about: + home: https://github.com/spacetelescope/mosviz + license: BSD + summary: | + Quick-look analysis and visualization tool for multi-object spectroscopy + +package: + name: {{ name }} + version: {{ version }} + +build: + number: {{ number }} + +source: + git_url: https://github.com/spacetelescope/mosviz.git + +requirements: + build: + - astropy + - specutils + - glueviz + - matplotlib + - numpy {{ numpy }} + - python {{ python }} + + run: + - astropy + - specutils + - glueviz + - matplotlib + - numpy + - python + +test: + requires: + - astropy + - specutils + imports: + - mosviz + diff --git a/namedlist/bld.bat b/namedlist/bld.bat index 85a7bc3..39b5e1f 100644 --- a/namedlist/bld.bat +++ b/namedlist/bld.bat @@ -1,2 +1 @@ %PYTHON% setup.py install -if errorlevel 1 exit 1 diff --git a/namedlist/meta.yaml b/namedlist/meta.yaml index 931fca7..f54aac3 100644 --- a/namedlist/meta.yaml +++ b/namedlist/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'namedlist' %} {% set version = '1.7' %} -{% set number = '0' %} +{% set number = '1' %} {% set filename = name + '-' + version + '.tar.gz' %} about: @@ -18,7 +18,7 @@ package: requirements: build: - setuptools - - python + - python {{ python }} run: - python diff --git a/nictools/bld.bat b/nictools/bld.bat index abdd1e3..5db04b7 100644 --- a/nictools/bld.bat +++ b/nictools/bld.bat @@ -1,4 +1,3 @@ -python setup.py install +%PYTHON% setup.py install 2to3 -w . -if errorlevel 1 exit 1
\ No newline at end of file diff --git a/nictools/build.sh b/nictools/build.sh index 4b71885..6bd6081 100644 --- a/nictools/build.sh +++ b/nictools/build.sh @@ -1,2 +1,2 @@ -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 8d7028a..5ddc9ad 100644 --- a/nictools/meta.yaml +++ b/nictools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'nictools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,15 +24,15 @@ requirements: - scipy - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - scipy - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git 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 4ca6de9..0000000 --- a/opuscoords/meta.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{% set name = 'opuscoords' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} - -about: - home: https://github.com/spacetelescope/{{ name }} - license: BSD - summary: opuscoords - -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_url: https://github.com/spacetelescope/{{ name }}.git - -test: - imports: - - opuscoords diff --git a/pandeia-thirdparty/bld.bat b/pandeia-thirdparty/bld.bat deleted file mode 100644 index 3aee3d8..0000000 --- a/pandeia-thirdparty/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -echo "meta-package"
\ No newline at end of file diff --git a/pandeia-thirdparty/build.sh b/pandeia-thirdparty/build.sh deleted file mode 100644 index ad736d3..0000000 --- a/pandeia-thirdparty/build.sh +++ /dev/null @@ -1,6 +0,0 @@ - -if [[ $PY3K != 0 ]]; then -echo "Pandeia does not support Python 3k, sorry." -exit 255 -fi -echo "meta-package"
\ No newline at end of file diff --git a/pandeia-thirdparty/meta.yaml b/pandeia-thirdparty/meta.yaml deleted file mode 100644 index 424950d..0000000 --- a/pandeia-thirdparty/meta.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{% set name = 'pandeia-thirdparty' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} - -about: - home: http://stsci.edu - license: BSD - summary: pandeia-thirdparty meta-package - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - run: - - astropy - - pandokia - - yolk - - parsley - - sphinx_rtd_theme - - sphinxcontrib-programoutput - - threading2 ==0.2.1 - - ws4py - - ext_shmht - - traceback2 - - mechanize - - pysynphot - - ginga - - photutils - - fftw - - pyfftw - - selenium >=2.44.0 - - tornado ==3.2.2 - - mysql-python [linux] - - jupyter - - jupyter_client - - ipython-notebook - - python x.x diff --git a/pandeia_data/bld.bat b/pandeia_data/bld.bat deleted file mode 100644 index 9d4cc8f..0000000 --- a/pandeia_data/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ - -if errorlevel 1 exit 1
\ No newline at end of file diff --git a/pandeia_data/build.sh b/pandeia_data/build.sh deleted file mode 100644 index 852dca8..0000000 --- a/pandeia_data/build.sh +++ /dev/null @@ -1,4 +0,0 @@ - -DATADIR="$PREFIX/share/pandeia_data" -mkdir -p $DATADIR -cp -a * $DATADIR || exit 1
\ No newline at end of file diff --git a/pandeia_data/meta.yaml b/pandeia_data/meta.yaml deleted file mode 100644 index 2d5a34a..0000000 --- a/pandeia_data/meta.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{% set name = 'pandeia_data' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} - -about: - home: https://github.com:stsci-ssb/pandeia_data - license: BSD - summary: pandeia_data - -build: - number: {{ number }} - preserve_egg_dir: 'yes' - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - setuptools - - python x.x - - run: - - pandeia - - python x.x - -source: - git_url: git@github.com:STScI-SSB/pandeia_data 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..6bd6081 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 diff --git a/pandokia/meta.yaml b/pandokia/meta.yaml index 54ad4f3..5084e95 100644 --- a/pandokia/meta.yaml +++ b/pandokia/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'pandokia' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://ssb.stsci.edu/testing/{{ name }} @@ -24,13 +25,13 @@ 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..233b298 100644 --- a/parsley/meta.yaml +++ b/parsley/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'parsley' %} {% set badname = 'Parsley' %} {% set version = '1.3' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://pypi.python.org/packages/source/P/{{ badname }} @@ -19,9 +19,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 5e8b365..5a5aeeb 100644 --- a/photutils/build.sh +++ b/photutils/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/photutils/meta.yaml b/photutils/meta.yaml index ad12632..2417653 100644 --- a/photutils/meta.yaml +++ b/photutils/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'photutils' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '3' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '4' %} about: home: https://github.com/astropy/{{ name }} @@ -18,17 +19,15 @@ package: requirements: build: - - d2to1 - - stsci.distutils - nose - astropy - cython - matplotlib - - numpy + - numpy {{ numpy }} - scikit-image - scipy - setuptools - - python x.x + - python {{ python }} run: - astropy @@ -38,7 +37,7 @@ requirements: - scikit-image - scipy - setuptools - - python x.x + - python source: git_url: https://github.com/astropy/{{ name }}.git 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..6bd6081 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 diff --git a/poppy/meta.yaml b/poppy/meta.yaml index cb9eaca..2fc9e2d 100644 --- a/poppy/meta.yaml +++ b/poppy/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'poppy' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/mperrin/{{ name }} @@ -20,14 +21,14 @@ requirements: build: - nose - astropy - - numpy + - numpy {{ numpy }} - scipy - matplotlib - six [py27] - mock [py27] - enum34 [py27] - setuptools - - python x.x + - python {{ python }} run: - nose @@ -39,7 +40,7 @@ requirements: - mock [py27] - enum34 [py27] - setuptools - - python x.x + - python source: git_url: https://github.com/mperrin/{{ name }}.git diff --git a/purge_path/bld.bat b/purge_path/bld.bat index b290566..760380e 100644 --- a/purge_path/bld.bat +++ b/purge_path/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/purge_path/build.sh b/purge_path/build.sh index 4b71885..6bd6081 100644 --- a/purge_path/build.sh +++ b/purge_path/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/purge_path/meta.yaml b/purge_path/meta.yaml index aa4187f..04b6556 100644 --- a/purge_path/meta.yaml +++ b/purge_path/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'purge_path' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/jhunkeler/{{ name }} @@ -18,11 +19,11 @@ package: requirements: build: - - python x.x + - python {{ python }} - setuptools run: - - python x.x + - python source: git_url: https://github.com/jhunkeler/{{ name }}.git diff --git a/py-expression-eval/meta.yaml b/py-expression-eval/meta.yaml index 1222220..5bcedb4 100644 --- a/py-expression-eval/meta.yaml +++ b/py-expression-eval/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'py-expression-eval' %} {% set version = '0.3.4' %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/Axiacore/{{ name }} @@ -18,7 +18,7 @@ build: requirements: build: - setuptools - - python + - python {{ python }} run: - python diff --git a/pyds9/bld.bat b/pyds9/bld.bat index dd8cae5..b572366 100644 --- a/pyds9/bld.bat +++ b/pyds9/bld.bat @@ -1,3 +1,3 @@ echo "Not yet" -exit 1
\ No newline at end of file +exit 1 diff --git a/pyds9/build.sh b/pyds9/build.sh index 4b71885..6bd6081 100644 --- a/pyds9/build.sh +++ b/pyds9/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/pyds9/meta.yaml b/pyds9/meta.yaml index 1ad3fd5..8544681 100644 --- a/pyds9/meta.yaml +++ b/pyds9/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'pyds9' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/ericmandel/{{ name }} @@ -23,8 +24,8 @@ requirements: - ds9 - six - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy @@ -32,7 +33,7 @@ requirements: - ds9 - six - numpy - - python x.x + - python source: git_url: https://github.com/ericmandel/{{ name }}.git 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..3b59dd7 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 diff --git a/pyfftw/meta.yaml b/pyfftw/meta.yaml index 05d571e..58402dc 100644 --- a/pyfftw/meta.yaml +++ b/pyfftw/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'pyfftw' %} {% set version = '0.9.2' %} -{% set number = '1' %} +{% set number = '2' %} about: home: http://hgomersall.github.com/pyFFTW @@ -22,18 +22,19 @@ requirements: - pkg-config [osx] - setuptools - numpy - - python x.x + - python {{ python }} run: - numpy >=1.9 - cython - fftw - numpy - - python x.x + - python source: fn: pyFFTW-0.9.2.tar.gz url: https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-0.9.2.tar.gz + md5: 34fcbc68afb8ebe5f040a02a8d20d565 test: imports: diff --git a/pymssql/bld.bat b/pymssql/bld.bat index 45ab2f4..209edf8 100644 --- a/pymssql/bld.bat +++ b/pymssql/bld.bat @@ -1,8 +1,6 @@ del _mssql.c "%PYTHON%" setup.py build_ext -I "%PREFIX%"\include -L "%PREFIX%"\lib -if errorlevel 1 exit 1 "%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt -if errorlevel 1 exit 1 :: Add more build steps here, if they are necessary. diff --git a/pymssql/meta.yaml b/pymssql/meta.yaml index f504d56..bc57a99 100644 --- a/pymssql/meta.yaml +++ b/pymssql/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'pymssql' %} {% set version = '2.1.3' %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} # Original recipe can be found here: # https://github.com/conda/conda-recipes @@ -24,7 +24,7 @@ build: requirements: build: - openssl 1.0.* # [win] - - python + - python {{ python }} - cython - setuptools - libiconv # [win] diff --git a/pyneb/bld.bat b/pyneb/bld.bat deleted file mode 100644 index b290566..0000000 --- a/pyneb/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/pyneb/build.sh b/pyneb/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/pyneb/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1
\ No newline at end of file diff --git a/pyneb/meta.yaml b/pyneb/meta.yaml deleted file mode 100644 index 32ac748..0000000 --- a/pyneb/meta.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{% set badname = 'PyNeb' %} -{% set name = 'pyneb' %} -{% set version = '1.0.14' %} -{% set number = '1' %} - -about: - home: http://www.iac.es/proyecto/PyNeb/ - license: Unknown - summary: A modern python tool to compute emission line emissivities - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - astropy - - matplotlib - - numpy - - scipy - - setuptools - - python x.x - - run: - - astropy - - matplotlib - - numpy - - scipy - - python x.x - -source: - fn: {{ badname }}-{{ version }}.tar.gz - url: https://pypi.python.org/packages/source/P/{{ badname }}/{{ badname }}-{{ version }}.tar.gz - -test: - imports: - - pyneb 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 5dbf629..f0953df 100644 --- a/pyobjc-core/meta.yaml +++ b/pyobjc-core/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'pyobjc-core' %} {% set version = '3.1.1' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://pyobjc.sourceforge.net/ @@ -19,14 +19,15 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: fn: pyobjc-{{ version }}.tar.gz url: https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2 + md5: 2a1dfe4646aebfda470789a39a317cdf test: imports: 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 7e8a100..5e4966e 100644 --- a/pyobjc-framework-cocoa/meta.yaml +++ b/pyobjc-framework-cocoa/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'pyobjc-framework-cocoa' %} {% set version = '3.1.1' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://pyobjc.sourceforge.net/ @@ -20,15 +20,16 @@ requirements: build: - pyobjc-core - setuptools - - python x.x + - python {{ python }} run: - pyobjc-core - - python x.x + - python source: fn: pyobjc-{{ version }}.tar.gz url: https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2 + md5: 2a1dfe4646aebfda470789a39a317cdf test: imports: 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 16b878b..7b19edc 100644 --- a/pyobjc-framework-quartz/meta.yaml +++ b/pyobjc-framework-quartz/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'pyobjc-framework-quartz' %} {% set version = '3.1.1' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://pyobjc.sourceforge.net/ @@ -21,16 +21,17 @@ requirements: - pyobjc-core - pyobjc-framework-cocoa - setuptools - - python x.x + - python {{ python }} run: - pyobjc-core - pyobjc-framework-cocoa - - python x.x + - python source: fn: pyobjc-{{ version }}.tar.gz url: https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2 + md5: 2a1dfe4646aebfda470789a39a317cdf #test: # - see runtest.py diff --git a/pyqtgraph/bld.bat b/pyqtgraph/bld.bat index b290566..760380e 100644 --- a/pyqtgraph/bld.bat +++ b/pyqtgraph/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/pyqtgraph/build.sh b/pyqtgraph/build.sh index 4b71885..6bd6081 100644 --- a/pyqtgraph/build.sh +++ b/pyqtgraph/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/pyqtgraph/meta.yaml b/pyqtgraph/meta.yaml index b9233f8..da3b4ac 100644 --- a/pyqtgraph/meta.yaml +++ b/pyqtgraph/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'pyqtgraph' %} {% set version = '0.10.0' %} -{% set number = '1' %} +{% set number = '2' %} about: home: http://www.pyqtgraph.org/ @@ -17,13 +17,13 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - pyqt - pyopengl - - numpy - - python x.x + - numpy {{ numpy }} + - python source: fn: {{ name }}-{{ version }}.tar.gz 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 110c3f4..4ce4164 100644 --- a/pyraf/build.sh +++ b/pyraf/build.sh @@ -9,4 +9,4 @@ set +e 2to3 -w . fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml index b3ce826..32f8503 100644 --- a/pyraf/meta.yaml +++ b/pyraf/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'pyraf' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -28,8 +29,8 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - d2to1 @@ -41,7 +42,7 @@ requirements: - pyobjc-framework-quartz [osx] - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/pyregion/bld.bat b/pyregion/bld.bat index 726b367..7fba400 100644 --- a/pyregion/bld.bat +++ b/pyregion/bld.bat @@ -1,5 +1,3 @@ -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 4b71885..6bd6081 100644 --- a/pyregion/build.sh +++ b/pyregion/build.sh @@ -1,2 +1,2 @@ -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 0110351..f9a1596 100644 --- a/pyregion/meta.yaml +++ b/pyregion/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'pyregion' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,17 +19,15 @@ package: requirements: build: - - d2to1 - - stsci.distutils - pyparsing - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - pyparsing - numpy - - python x.x + - python - setuptools source: diff --git a/pysynphot/bld.bat b/pysynphot/bld.bat index b290566..39b5e1f 100644 --- a/pysynphot/bld.bat +++ b/pysynphot/bld.bat @@ -1,3 +1 @@ - -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/pysynphot/build.sh b/pysynphot/build.sh index 4b71885..5a5aeeb 100644 --- a/pysynphot/build.sh +++ b/pysynphot/build.sh @@ -1,2 +1 @@ - -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/pysynphot/meta.yaml b/pysynphot/meta.yaml index 3a114ab..61901c1 100644 --- a/pysynphot/meta.yaml +++ b/pysynphot/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'pysynphot' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,15 +20,13 @@ package: requirements: build: - - d2to1 - - stsci.distutils - nose - astropy - cython - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - nose @@ -35,7 +34,7 @@ requirements: - cython - matplotlib - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/python-daemon/bld.bat b/python-daemon/bld.bat index b290566..760380e 100644 --- a/python-daemon/bld.bat +++ b/python-daemon/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/python-daemon/build.sh b/python-daemon/build.sh index 4b71885..6bd6081 100644 --- a/python-daemon/build.sh +++ b/python-daemon/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/python-daemon/meta.yaml b/python-daemon/meta.yaml index 5605faa..0af3c79 100644 --- a/python-daemon/meta.yaml +++ b/python-daemon/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'python-daemon' %} {% set version = '2.0.5' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://bitbucket.org/jhunkeler/python-daemon @@ -18,11 +18,11 @@ requirements: build: - docutils - lockfile - - python x.x + - python {{ python }} run: - lockfile - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz diff --git a/pytools/bld.bat b/pytools/bld.bat index b290566..760380e 100644 --- a/pytools/bld.bat +++ b/pytools/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/pytools/build.sh b/pytools/build.sh index 4b71885..6bd6081 100644 --- a/pytools/build.sh +++ b/pytools/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/pytools/meta.yaml b/pytools/meta.yaml index 9cbe9ab..284aa42 100644 --- a/pytools/meta.yaml +++ b/pytools/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'pytools' %} {% set version = '2016.1' %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://pypi.python.org/pytools @@ -21,14 +21,14 @@ requirements: - six >=1.8.0 - numpy >=1.6.0 - setuptools - - python x.x + - python {{ python }} run: - decorator >=3.2.0 - appdirs >=1.4.0 - six >=1.8.0 - numpy >=1.6.0 - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz 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 965c899..0000000 --- a/pywcs/meta.yaml +++ /dev/null @@ -1,38 +0,0 @@ -{% set name = 'pywcs' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '2' %} - -about: - home: https://github.com/spacetelescope/{{ name }} - license: BSD - summary: pywcs - -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/reftools/bld.bat b/reftools/bld.bat index 726b367..7fba400 100644 --- a/reftools/bld.bat +++ b/reftools/bld.bat @@ -1,5 +1,3 @@ -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/reftools/build.sh b/reftools/build.sh index 4b71885..6bd6081 100644 --- a/reftools/build.sh +++ b/reftools/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/reftools/meta.yaml b/reftools/meta.yaml index 1d071de..d49fa25 100644 --- a/reftools/meta.yaml +++ b/reftools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'reftools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: http://github.com/spacetelescope/{{ name }} @@ -19,29 +20,14 @@ package: requirements: build: - - d2to1 - - stsci.distutils - - stsci.imagestats - - stsci.tools - - pywcs - - pysynphot - - stwcs - - calcos - - scipy + - astropy >=1.1 + - numpy {{ numpy }} + - python {{ python }} - setuptools - - numpy - - python x.x - run: - - stsci.imagestats - - stsci.tools - - pywcs - - pysynphot - - stwcs - - calcos - - scipy + - astropy >=1.1 - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git 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 dcd41c0..997c90e 100644 --- a/relic/meta.yaml +++ b/relic/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'relic' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://github.com/jhunkeler/{{ name }} @@ -19,10 +20,10 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: git_url: https://github.com/jhunkeler/{{ name }}.git 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..0cf54db 100644 --- a/secretstorage/meta.yaml +++ b/secretstorage/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'secretstorage' %} {% set version = '2.3.1' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/mitya57/{{ name }} @@ -22,7 +22,7 @@ source: requirements: build: - - python + - python {{ python }} - dbus-python - setuptools - cryptography diff --git a/selenium/bld.bat b/selenium/bld.bat index b290566..760380e 100644 --- a/selenium/bld.bat +++ b/selenium/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/selenium/build.sh b/selenium/build.sh index 4b71885..6bd6081 100644 --- a/selenium/build.sh +++ b/selenium/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/selenium/meta.yaml b/selenium/meta.yaml index 88eb542..36e49fa 100644 --- a/selenium/meta.yaml +++ b/selenium/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'selenium' %} {% set version = '2.49.2' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://pypi.python.org/packages/source/s/{{ name }} @@ -17,10 +17,10 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz diff --git a/sextractor/bld.bat b/sextractor/bld.bat new file mode 100644 index 0000000..3dd9db3 --- /dev/null +++ b/sextractor/bld.bat @@ -0,0 +1,2 @@ + +echo Unsupported diff --git a/sextractor/build.sh b/sextractor/build.sh new file mode 100644 index 0000000..674229e --- /dev/null +++ b/sextractor/build.sh @@ -0,0 +1,8 @@ +autoreconf -i +./configure --prefix=$PREFIX \ + --disable-static \ + --enable-mkl-gcc \ + --with-mkl-dir=$PREFIX + +make -j ${CPU_COUNT} +make install diff --git a/largepacks/sextractor/meta.yaml b/sextractor/meta.yaml index dd7fc2d..cc6efab 100644 --- a/largepacks/sextractor/meta.yaml +++ b/sextractor/meta.yaml @@ -6,22 +6,36 @@ about: home: http://www.astromatic.net/download/sextractor license: GPL summary: sextractor + build: number: {{ number }} + package: name: {{ name }} version: {{ version }} + requirements: build: - - atlas-generic [linux] - autoconf [osx] - - m4 [osx] - fftw + - gcc + - libtool [osx] + - m4 [osx] + - mkl-devel - pkgconfig run: - - atlas-generic [linux] + - mkl + - libgcc - fftw + source: + patches: + - {{ name }}-mkl-gcc.patch + fn: {{ name }}-{{ version }}.tar.gz - url: - - http://www.astromatic.net/download/sextractor/{{ name }}-{{ version }}.tar.gz + url: http://www.astromatic.net/download/sextractor/{{ name }}-{{ version }}.tar.gz + md5: 2115556b5d30571306608b7c023a318f + +test: + commands: + - sex --help diff --git a/sextractor/sextractor-mkl-gcc.patch b/sextractor/sextractor-mkl-gcc.patch new file mode 100644 index 0000000..10f07e3 --- /dev/null +++ b/sextractor/sextractor-mkl-gcc.patch @@ -0,0 +1,283 @@ +diff -u -p --recursive -N a/sextractor-2.19.5/acx_mkl_gcc.m4 b/sextractor-2.19.5/acx_mkl_gcc.m4 +--- a/sextractor-2.19.5/acx_mkl_gcc.m4 1969-12-31 19:00:00.000000000 -0500 ++++ b/sextractor-2.19.5/acx_mkl_gcc.m4 2017-12-30 17:54:54.000000000 -0500 +@@ -0,0 +1,210 @@ ++dnl ++dnl acx_mkl_gcc.m4 ++dnl ++dnl Set up options for using the INTEL MKL library. ++dnl ++dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ++dnl ++dnl This file part of: AstrOmatic software ++dnl ++dnl Copyright: (C) 2003-2013 Emmanuel Bertin -- IAP/CNRS/UPMC ++dnl ++dnl License: GNU General Public License ++dnl ++dnl AstrOmatic software is free software: you can redistribute it and/or ++dnl modify it under the terms of the GNU General Public License as ++dnl published by the Free Software Foundation, either version 3 of the ++dnl License, or (at your option) any later version. ++dnl AstrOmatic software is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++dnl GNU General Public License for more details. ++dnl You should have received a copy of the GNU General Public License ++dnl along with AstrOmatic software. ++dnl If not, see <http://www.gnu.org/licenses/>. ++dnl ++dnl Last modified: 17/04/2013 ++dnl ++dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ++dnl ++dnl @synopsis ACX_MKL_GCC([MKL_DIR, ILP64_FLAG, STATIC_FLAG, CONV_LIBS]) ++dnl ++dnl This macro sets the MKL_CFLAGS, MKL_LDFLAGS and MKL_LIBS variables to ++dnl for compiling and linking with INTEL's MKL. A coma-separated list of ++dnl convenience libraries may be included in the linked group for static linking. ++dnl You may wish to use these variables in your default CFLAGS: ++dnl ++dnl CFLAGS="$CFLAGS $MKL_CFLAGS" ++dnl ++dnl You may wish to use these variables in your default LDFLAGS: ++dnl ++dnl LDFLAGS="$LDFLAGS $MKL_LDLAGS" ++dnl ++dnl You may wish to use these variables in your default LIBS: ++dnl ++dnl LIBS="$LIBS $MKL_LIBS" ++dnl ++ ++AC_DEFUN([ACX_MKL_GCC], [ ++AC_REQUIRE([AC_CANONICAL_HOST]) ++ ++dnl ------------------------ ++dnl Set MKL's root directory ++dnl ------------------------ ++ ++if test x$1 = x; then ++ mklroot=${MKLROOT} ++else ++ mklroot=$1 ++fi ++ ++dnl ----------------------------- ++dnl Include convenience libraries ++dnl ----------------------------- ++ ++if test x$4 = x; then ++ startgroup="-Wl,--start-group" ++else ++ startgroup="-Wl,--start-group,$4" ++fi ++ ++dnl ---------------------- ++dnl Set architecture flags ++dnl ---------------------- ++ ++dnl check if GCC (or clang... it doesn't matter here) compiler is present ++gcc --version 2>&1 | egrep -i "gcc|clang" > /dev/null 2>&1 && flaggcc=yes ++ ++# Meh. ++flag64=yes ++ ++dnl check if the platform is OSX ++sw_vers 2>&1 | grep -i "ProductVersion" > /dev/null 2>&1 && flagosx=yes ++ ++dnl ---------------------- ++dnl Exit if INTEL compiler is not found ++dnl ---------------------- ++if test x$flaggcc = x; then ++ AC_SUBST(MKL_CFLAGS, "") ++ AC_SUBST(MKL_LDFLAGS, "") ++ AC_SUBST(MKL_LIBS, "") ++ MKL_WARN="GCC compiler not detected" ++ AC_SUBST(MKL_WARN) ++ exit ++fi ++ ++if test x$flagosx = xyes; then ++dnl MacOSX ++ if test x$flag64 = xyes; then ++dnl INTEL compiler uses Intel64 architecture ++ if test x$2 = xyes; then ++dnl 64 bit pointers ++ AC_SUBST(MKL_CFLAGS, "-fopenmp -DMKL_ILP64 -I$mklroot/include") ++ if test x$3 = xyes; then ++dnl Static linking ++ AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel_ilp64.a \ ++ $mklroot/lib/libmkl_intel_thread.a \ ++ $mklroot/lib/libmkl_core.a -lpthread -lm"]) ++ else ++dnl Dynamic linking ++ AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel_ilp64 \ ++ -lmkl_intel_thread -lmkl_core -lpthread -lm") ++ fi ++ else ++dnl 32 bit pointers ++ AC_SUBST(MKL_CFLAGS, "-fopenmp -I$mklroot/include") ++ if test x$3 = xyes; then ++dnl Static linking ++ AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel_lp64.a \ ++ $mklroot/lib/libmkl_intel_thread.a \ ++ $mklroot/lib/libmkl_core.a -lpthread -lm"]) ++ else ++dnl Dynamic linking ++ AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel_lp64 \ ++ -lmkl_intel_thread -lmkl_core -lpthread -lm") ++ fi ++ fi ++ else ++dnl INTEL compiler uses IA32 architecture ++ AC_SUBST(MKL_CFLAGS, "-fopenmp -I$mklroot/include") ++ if test x$3 = xyes; then ++dnl Static linking ++ AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel.a \ ++ $mklroot/lib/libmkl_intel_thread.a \ ++ $mklroot/lib/libmkl_core.a -lpthread -lm"]) ++ else ++dnl Dynamic linking ++ AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel -lmkl_intel_thread \ ++ -lmkl_core -lpthread -lm") ++ fi ++ fi ++else ++dnl Linux ++ if test x$flag64 = xyes; then ++dnl INTEL compiler uses Intel64 architecture ++ if test x$2 = xyes; then ++dnl 64 bit pointers ++ AC_SUBST(MKL_CFLAGS, "-fopenmp -DMKL_ILP64 -I$mklroot/include") ++ if test x$3 = xyes; then ++dnl Static linking ++ AC_SUBST(MKL_LIBS, ++ ["$startgroup,$mklroot/lib/intel64/libmkl_intel_ilp64.a,\ ++$mklroot/lib/intel64/libmkl_intel_thread.a,\ ++$mklroot/lib/intel64/libmkl_core.a,-end-group -lpthread -lm"]) ++ else ++dnl Dynamic linking ++ AC_SUBST(MKL_LIBS, "-L$mklroot/lib/intel64 -lmkl_intel_ilp64 \ ++ -lmkl_intel_thread -lmkl_core -lpthread -lm") ++ fi ++ else ++dnl 32 bit pointers ++ AC_SUBST(MKL_CFLAGS, "-fopenmp -I$mklroot/include") ++ if test x$3 = xyes; then ++dnl Static linking ++ AC_SUBST(MKL_LIBS, ++ ["$startgroup,$mklroot/lib/intel64/libmkl_intel_lp64.a,\ ++$mklroot/lib/intel64/libmkl_intel_thread.a,\ ++$mklroot/lib/intel64/libmkl_core.a,--end-group -lpthread -lm"]) ++ else ++dnl Dynamic linking ++ AC_SUBST(MKL_LIBS, "-L$mklroot/lib/intel64 -lmkl_intel_lp64 \ ++ -lmkl_intel_thread -lmkl_core -lpthread -lm") ++ fi ++ fi ++ else ++dnl INTEL compiler uses IA32 architecture ++ AC_SUBST(MKL_CFLAGS, "-fopenmp -I$mklroot/include") ++ if test x$3 = xyes; then ++dnl Static linking ++ AC_SUBST(MKL_LIBS, ["$startgroup,$mklroot/lib/ia32/libmkl_intel.a,\ ++$mklroot/lib/ia32/libmkl_intel_thread.a,\ ++$mklroot/lib/ia32/libmkl_core.a,--end-group -lpthread -lm"]) ++ else ++dnl Dynamic linking ++ AC_SUBST(MKL_LIBS, "-L$mklroot/lib/ia32 -lmkl_intel -lmkl_intel_thread \ ++ -lmkl_core -lpthread -lm") ++ fi ++ fi ++fi ++ ++AC_SUBST(MKL_LDFLAGS, "") ++ ++dnl -------------------- ++dnl Set internal flags ++dnl -------------------- ++ ++AC_DEFINE(HAVE_MKL,1, [Define if you have the MKL libraries.]) ++AC_DEFINE(HAVE_FFTW,1, [Define if you have the FFTW libraries.]) ++AC_DEFINE(HAVE_LAPACK,1, [Define if you have the LAPACK libraries.]) ++AC_DEFINE(HAVE_LAPACKE,1, [Define if you have the LAPACKe libraries.]) ++ ++dnl -------------------- ++dnl Set include files ++dnl -------------------- ++ ++AC_DEFINE_UNQUOTED(MKL_H, "mkl.h", [MKL header filename.]) ++AC_DEFINE_UNQUOTED(FFTW_H, "fftw/fftw3_mkl.h", [FFTW header filename.]) ++AC_DEFINE_UNQUOTED(LAPACK_H, "mkl_lapack.h", [LAPACK header filename.]) ++AC_DEFINE_UNQUOTED(LAPACKE_H, "mkl_lapacke.h", [LAPACKe header filename.]) ++ ++])dnl ACX_MKL_GCC +diff -u -p --recursive -N a/sextractor-2.19.5/configure.ac b/sextractor-2.19.5/configure.ac +--- a/sextractor-2.19.5/configure.ac 2013-12-14 12:12:32.000000000 -0500 ++++ b/sextractor-2.19.5/configure.ac 2017-12-30 16:37:44.000000000 -0500 +@@ -48,6 +48,7 @@ AC_SUBST(DATE3, "$date3") + sinclude(acx_atlas.m4) + sinclude(acx_fftw.m4) + sinclude(acx_mkl.m4) ++sinclude(acx_mkl_gcc.m4) + sinclude(acx_prog_cc_optim.m4) + sinclude(acx_pthread.m4) + sinclude(acx_urbi_resolve_dir.m4) +@@ -79,12 +80,21 @@ AC_ARG_ENABLE(icc, + AC_MSG_CHECKING([whether we should use INTEL's MKL]) + AC_ARG_ENABLE(mkl, + [AS_HELP_STRING([--enable-mkl], +- [Use INTEL's MKL for solvers and FFTs (off by default)])], ++ [Use INTEL MKL for solvers and FFTs (off by default)])], + enable_icc="yes" + CC="icc" + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no])) + ++AC_MSG_CHECKING([whether we should use INTEL MKL with gcc]) ++AC_ARG_ENABLE(mkl_gcc, ++ [AS_HELP_STRING([--enable-mkl-gcc], ++ [Use INTEL MKL for solvers and FFTs (off by default)])], ++ enable_mkl_gcc="yes" ++ CC="gcc" ++ AC_MSG_RESULT([yes]), ++ AC_MSG_RESULT([no])) ++ + # Checks for programs. + AC_LANG(C) + +@@ -105,7 +115,7 @@ AC_HEADER_STDC + AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/mman.h \ + sys/types.h unistd.h]) + # Checks for INTEL math header files. +-if test x$enable_icc = xyes; then ++if test x$enable_icc = xyes || test x$enable_mkl_gcc = xyes; then + AC_CHECK_HEADERS(mathimf.h) + fi + +@@ -226,9 +236,14 @@ AM_CONDITIONAL(USE_THREADS, [test x$use_ + if test x$enable_model_fitting != xno; then + AC_DEFINE(USE_MODEL, 1, [Triggers model-fitting]) + ############ handle the INTEL MKL library (FFTW + LAPACK) ########### +- if test x$enable_mkl = xyes; then ++ if test x$enable_mkl = xyes || test x$enable_mkl_gcc = xyes; then + convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a" +- ACX_MKL($with_mkl_dir,,$enable_best_link,$convlibs) ++ if test x$enable_mkl_gcc = xyes; then ++ ACX_MKL_GCC($with_mkl_dir,,$enable_best_link,$convlibs) ++ else ++ ACX_MKL($with_mkl_dir,,$enable_best_link,$convlibs) ++ fi ++ + if test x$MKL_WARN != x; then + AC_MSG_WARN([$MKL_WARN]) + fi +@@ -256,7 +271,7 @@ AM_CONDITIONAL(USE_MODEL, [test x$enable + + # Compile with profiling option + if test x$enable_profiling = xyes; then +- if test x$enable_icc = xyes; then ++ if test x$enable_icc = xyes || test x$enable_mkl_gcc = xyes; then + AM_CFLAGS="$AM_CFLAGS -pq" + else + AM_CFLAGS="$AM_CFLAGS -pg" diff --git a/shunit2/bld.bat b/shunit2/bld.bat index a3b28b5..8af8aaa 100644 --- a/shunit2/bld.bat +++ b/shunit2/bld.bat @@ -1,3 +1,3 @@ echo Nope. -exit 1
\ No newline at end of file +exit 1 diff --git a/shunit2/build.sh b/shunit2/build.sh index 15a32f8..90af6ce 100644 --- a/shunit2/build.sh +++ b/shunit2/build.sh @@ -3,4 +3,4 @@ mkdir -p $PREFIX/bin \ $PREFIX/share/doc/shunit2 chmod +x src/shell/shunit2 cp -a src/shell/shunit2 $PREFIX/bin -cp doc/* $PREFIX/share/doc/shunit2
\ No newline at end of file +cp doc/* $PREFIX/share/doc/shunit2 diff --git a/shunit2/meta.yaml b/shunit2/meta.yaml index 08e86a5..ebca002 100644 --- a/shunit2/meta.yaml +++ b/shunit2/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'shunit2' %} {% set version = '2.1.3' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://sourceforge.net/projects/shunit2 @@ -17,6 +17,7 @@ package: source: fn: {{ name }}-{{ version }}.tgz url: https://downloads.sourceforge.net/shunit2/{{ name }}-{{ version }}.tgz + md5: 156a2491925a269fe09b70562deae091 test: commands: diff --git a/specutils/meta.yaml b/specutils/meta.yaml index ee7ddfc..51bb7ef 100644 --- a/specutils/meta.yaml +++ b/specutils/meta.yaml @@ -1,7 +1,9 @@ {% set name = 'specutils' %} -{% set version = '0.2.1' %} -{% set tag = 'v' + version %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/astropy/specutils @@ -16,7 +18,6 @@ build: number: {{ number }} source: - git_tag: {{ tag }} git_url: https://github.com/astropy/{{ name }}.git requirements: @@ -25,20 +26,22 @@ requirements: - cython - scipy - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - scipy - numpy - - python x.x + - python test: imports: - specutils + - specutils.analysis - specutils.io - - specutils.models + - specutils.modeling + - specutils.spectra - specutils.utils - specutils.wcs diff --git a/specview/bld.bat b/specview/bld.bat index c50c85a..760380e 100644 --- a/specview/bld.bat +++ b/specview/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 diff --git a/specview/build.sh b/specview/build.sh index b875087..6bd6081 100644 --- a/specview/build.sh +++ b/specview/build.sh @@ -1,2 +1,2 @@ -python setup.py install --offline || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/specview/meta.yaml b/specview/meta.yaml index 283a485..3a9c88f 100644 --- a/specview/meta.yaml +++ b/specview/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'specview' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,18 +20,18 @@ package: requirements: build: - astropy - - numpy + - numpy {{ numpy }} - scipy - pyqtgraph - setuptools - - python x.x + - python {{ python }} run: - astropy - numpy - scipy - pyqtgraph - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/specviz/meta.yaml b/specviz/meta.yaml index 89a1f32..29488b5 100644 --- a/specviz/meta.yaml +++ b/specviz/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'specviz' %} {% set version = '0.2.1rc5' %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/specviz @@ -26,8 +26,8 @@ requirements: - scipy - yaml - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy @@ -39,7 +39,7 @@ requirements: - scipy - yaml - numpy - - python x.x + - python test: requires: 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 7ee5167..ae12b32 100644 --- a/spherical-geometry/meta.yaml +++ b/spherical-geometry/meta.yaml @@ -1,9 +1,10 @@ {% set name = 'spherical-geometry' %} {% set reponame = 'spherical_geometry' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ reponame }} @@ -22,14 +23,14 @@ requirements: - astropy - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - matplotlib - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ reponame }}.git diff --git a/sphinx_rtd_theme/bld.bat b/sphinx_rtd_theme/bld.bat index b290566..760380e 100644 --- a/sphinx_rtd_theme/bld.bat +++ b/sphinx_rtd_theme/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/sphinx_rtd_theme/build.sh b/sphinx_rtd_theme/build.sh index 4b71885..6bd6081 100644 --- a/sphinx_rtd_theme/build.sh +++ b/sphinx_rtd_theme/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/sphinx_rtd_theme/meta.yaml b/sphinx_rtd_theme/meta.yaml index cb9d135..c8f1273 100644 --- a/sphinx_rtd_theme/meta.yaml +++ b/sphinx_rtd_theme/meta.yaml @@ -1,12 +1,12 @@ {% set name = 'sphinx_rtd_theme' %} {% set version = '0.1.9' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://pypi.python.org/packages/source/s/sphinx_rtd_theme license: BSD summary: sphinx_rtd_theme - + build: number: {{ number }} @@ -18,11 +18,11 @@ requirements: build: - sphinx - setuptools - - python x.x + - python {{ python }} run: - sphinx - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz 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..6bd6081 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 diff --git a/sphinxcontrib-programoutput/meta.yaml b/sphinxcontrib-programoutput/meta.yaml index fbc63e7..e11af1c 100644 --- a/sphinxcontrib-programoutput/meta.yaml +++ b/sphinxcontrib-programoutput/meta.yaml @@ -1,16 +1,16 @@ {% set name = 'sphinxcontrib-programoutput' %} {% set version = '0.8' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://pypi.python.org/packages/source/s/{{ name }} license: BSD summary: sphinxcontrib-programoutput - + build: number: {{ number }} preserve_egg_dir: True - + package: name: {{ name }} version: {{ version }} @@ -19,11 +19,11 @@ 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..5a5aeeb 100644 --- a/stginga/build.sh +++ b/stginga/build.sh @@ -1,2 +1 @@ - -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/stginga/meta.yaml b/stginga/meta.yaml index f80694e..8727f9f 100644 --- a/stginga/meta.yaml +++ b/stginga/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stginga' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -20,17 +21,17 @@ requirements: build: - ginga - astropy - - numpy + - numpy {{ numpy }} - scipy - setuptools - - python x.x + - python {{ python }} run: - ginga - astropy - numpy - scipy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stistools/bld.bat b/stistools/bld.bat index 726b367..7fba400 100644 --- a/stistools/bld.bat +++ b/stistools/bld.bat @@ -1,5 +1,3 @@ -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 4b71885..6bd6081 100644 --- a/stistools/build.sh +++ b/stistools/build.sh @@ -1,2 +1,2 @@ -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 4b7fc57..1762e4f 100644 --- a/stistools/meta.yaml +++ b/stistools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stistools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -24,15 +25,15 @@ requirements: - scipy - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - scipy - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci-data-analysis/bld.bat b/stsci-data-analysis/bld.bat index 3aee3d8..385b56a 100644 --- a/stsci-data-analysis/bld.bat +++ b/stsci-data-analysis/bld.bat @@ -1,2 +1,2 @@ -echo "meta-package"
\ No newline at end of file +echo "meta-package" diff --git a/stsci-data-analysis/build.sh b/stsci-data-analysis/build.sh index 3aee3d8..385b56a 100644 --- a/stsci-data-analysis/build.sh +++ b/stsci-data-analysis/build.sh @@ -1,2 +1,2 @@ -echo "meta-package"
\ No newline at end of file +echo "meta-package" diff --git a/stsci-data-analysis/meta.yaml b/stsci-data-analysis/meta.yaml index 80fe7ed..d8286f2 100644 --- a/stsci-data-analysis/meta.yaml +++ b/stsci-data-analysis/meta.yaml @@ -1,8 +1,6 @@ {% set name = 'stsci-data-analysis' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '2' %} +{% set version = '0.0.0dev.0' %} +{% set number = '3' %} about: home: http://stsci.edu @@ -17,17 +15,6 @@ package: version: {{ version }} requirements: - build: - - astropy >=*0.0* - - astroimtools >=*0.0* - - stginga >=*0.0* - - specviz >=*0.0* - - photutils >=*0.0* - - glueviz >=*0.0* - - imexam >=*0.0* - - asdf >=*0.0* - - numpy - - python x.x run: - astropy >=*0.0* - astroimtools >=*0.0* @@ -38,5 +25,5 @@ requirements: - imexam >=*0.0* - asdf >=*0.0* - numpy - - python x.x + - python diff --git a/stsci-hst/bld.bat b/stsci-hst/bld.bat index 3aee3d8..385b56a 100644 --- a/stsci-hst/bld.bat +++ b/stsci-hst/bld.bat @@ -1,2 +1,2 @@ -echo "meta-package"
\ No newline at end of file +echo "meta-package" diff --git a/stsci-hst/build.sh b/stsci-hst/build.sh index 3aee3d8..385b56a 100644 --- a/stsci-hst/build.sh +++ b/stsci-hst/build.sh @@ -1,2 +1,2 @@ -echo "meta-package"
\ No newline at end of file +echo "meta-package" diff --git a/stsci-hst/meta.yaml b/stsci-hst/meta.yaml index 3b1102b..e6122d1 100644 --- a/stsci-hst/meta.yaml +++ b/stsci-hst/meta.yaml @@ -1,8 +1,6 @@ {% set name = 'stsci-hst' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = '0.0.0dev.0' %} +{% set number = '2' %} about: home: http://www.stsci.edu @@ -30,7 +28,6 @@ requirements: - nictools >=*0.0* - pyregion >=*0.0* - pysynphot >=*0.0* - - pywcs >=*0.0* - reftools >=*0.0* - stistools >=*0.0* - stsci.convolve >=*0.0* @@ -48,4 +45,4 @@ requirements: - wfpc2tools >=*0.0* - wfc3tools >=*0.0* - numpy - - python x.x + - python diff --git a/stsci-jwst/meta.yaml b/stsci-jwst/meta.yaml deleted file mode 100644 index 0da0ca0..0000000 --- a/stsci-jwst/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{% set name = 'stsci-jwst' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} - -about: - home: http://www.stsci.edu - license: BSD - summary: stsci-jwst meta-package - -build: - number: {{ number }} - -package: - name: {{ name }} - version: {{ version }} - -requirements: - build: - - jwst - - numpy - - python x.x - run: - - jwst - - numpy - - python x.x diff --git a/stsci.convolve/bld.bat b/stsci.convolve/bld.bat index 976d3b9..7fba400 100644 --- a/stsci.convolve/bld.bat +++ b/stsci.convolve/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/stsci.convolve/build.sh b/stsci.convolve/build.sh index 4b71885..6bd6081 100644 --- a/stsci.convolve/build.sh +++ b/stsci.convolve/build.sh @@ -1,2 +1,2 @@ -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 1988b6a..9217138 100644 --- a/stsci.convolve/meta.yaml +++ b/stsci.convolve/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.convolve' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,12 +22,12 @@ requirements: build: - d2to1 - stsci.distutils - - 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.distutils/bld.bat b/stsci.distutils/bld.bat index eb68153..371bd69 100644 --- a/stsci.distutils/bld.bat +++ b/stsci.distutils/bld.bat @@ -1,7 +1,5 @@ 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 4b71885..6bd6081 100644 --- a/stsci.distutils/build.sh +++ b/stsci.distutils/build.sh @@ -1,2 +1,2 @@ -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 1ed7129..ec67939 100644 --- a/stsci.distutils/meta.yaml +++ b/stsci.distutils/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.distutils' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -20,13 +21,13 @@ 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 976d3b9..7fba400 100644 --- a/stsci.image/bld.bat +++ b/stsci.image/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/stsci.image/build.sh b/stsci.image/build.sh index 4b71885..6bd6081 100644 --- a/stsci.image/build.sh +++ b/stsci.image/build.sh @@ -1,2 +1,2 @@ -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 7b818cc..7a5e7f3 100644 --- a/stsci.image/meta.yaml +++ b/stsci.image/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.image' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -25,15 +26,15 @@ requirements: - scipy - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - scipy - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.imagemanip/bld.bat b/stsci.imagemanip/bld.bat index 976d3b9..7fba400 100644 --- a/stsci.imagemanip/bld.bat +++ b/stsci.imagemanip/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/stsci.imagemanip/build.sh b/stsci.imagemanip/build.sh index 4b71885..6bd6081 100644 --- a/stsci.imagemanip/build.sh +++ b/stsci.imagemanip/build.sh @@ -1,2 +1,2 @@ -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 f966a72..0a08604 100644 --- a/stsci.imagemanip/meta.yaml +++ b/stsci.imagemanip/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.imagemanip' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,12 +23,12 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.imagestats/bld.bat b/stsci.imagestats/bld.bat index 976d3b9..7fba400 100644 --- a/stsci.imagestats/bld.bat +++ b/stsci.imagestats/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/stsci.imagestats/build.sh b/stsci.imagestats/build.sh index 4b71885..6bd6081 100644 --- a/stsci.imagestats/build.sh +++ b/stsci.imagestats/build.sh @@ -1,2 +1,2 @@ -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 8ab9b02..72017b2 100644 --- a/stsci.imagestats/meta.yaml +++ b/stsci.imagestats/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.imagestats' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,12 +23,12 @@ 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 976d3b9..7fba400 100644 --- a/stsci.ndimage/bld.bat +++ b/stsci.ndimage/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/stsci.ndimage/build.sh b/stsci.ndimage/build.sh index 4b71885..6bd6081 100644 --- a/stsci.ndimage/build.sh +++ b/stsci.ndimage/build.sh @@ -1,2 +1,2 @@ -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 64b8786..95f6e4c 100644 --- a/stsci.ndimage/meta.yaml +++ b/stsci.ndimage/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.ndimage' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,13 +24,13 @@ requirements: - stsci.distutils - astropy - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - 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 976d3b9..7fba400 100644 --- a/stsci.numdisplay/bld.bat +++ b/stsci.numdisplay/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/stsci.numdisplay/build.sh b/stsci.numdisplay/build.sh index 4b71885..6bd6081 100644 --- a/stsci.numdisplay/build.sh +++ b/stsci.numdisplay/build.sh @@ -1,2 +1,2 @@ -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 1696a28..93c61d0 100644 --- a/stsci.numdisplay/meta.yaml +++ b/stsci.numdisplay/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.numdisplay' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,13 +24,13 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - stsci.tools - numpy - - 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 abdd1e3..5db04b7 100644 --- a/stsci.skypac/bld.bat +++ b/stsci.skypac/bld.bat @@ -1,4 +1,3 @@ -python setup.py install +%PYTHON% setup.py install 2to3 -w . -if errorlevel 1 exit 1
\ No newline at end of file diff --git a/stsci.skypac/build.sh b/stsci.skypac/build.sh index c2dff0e..5a5aeeb 100644 --- a/stsci.skypac/build.sh +++ b/stsci.skypac/build.sh @@ -1,26 +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 - - -if [ $PY3K -ne 0 ] ; then -2to3 -w . -fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml index 7c9800e..0a55332 100644 --- a/stsci.skypac/meta.yaml +++ b/stsci.skypac/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.skypac' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -27,8 +28,8 @@ requirements: - stsci.tools - stwcs - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy @@ -36,8 +37,8 @@ requirements: - stsci.sphere - stsci.tools - stwcs - - python x.x - - python x.x + - python + - python source: git_url: https://github.com/spacetelescope/{{ name }} diff --git a/stsci.sphere/bld.bat b/stsci.sphere/bld.bat index 976d3b9..7fba400 100644 --- a/stsci.sphere/bld.bat +++ b/stsci.sphere/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/stsci.sphere/build.sh b/stsci.sphere/build.sh index 4b71885..6bd6081 100644 --- a/stsci.sphere/build.sh +++ b/stsci.sphere/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/stsci.sphere/meta.yaml b/stsci.sphere/meta.yaml index 4bafc99..bd5bb34 100644 --- a/stsci.sphere/meta.yaml +++ b/stsci.sphere/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.sphere' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -24,14 +25,14 @@ requirements: - astropy - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - matplotlib - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci.sphinxext/bld.bat b/stsci.sphinxext/bld.bat index 976d3b9..7fba400 100644 --- a/stsci.sphinxext/bld.bat +++ b/stsci.sphinxext/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/stsci.sphinxext/build.sh b/stsci.sphinxext/build.sh index 4b71885..6bd6081 100644 --- a/stsci.sphinxext/build.sh +++ b/stsci.sphinxext/build.sh @@ -1,2 +1,2 @@ -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 8838182..7d1186b 100644 --- a/stsci.sphinxext/meta.yaml +++ b/stsci.sphinxext/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.sphinxext' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -23,11 +24,11 @@ requirements: - stsci.distutils - numpydoc - setuptools - - python x.x + - python {{ python }} run: - numpydoc - - 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 976d3b9..7fba400 100644 --- a/stsci.stimage/bld.bat +++ b/stsci.stimage/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/stsci.stimage/build.sh b/stsci.stimage/build.sh index 4b71885..6bd6081 100644 --- a/stsci.stimage/build.sh +++ b/stsci.stimage/build.sh @@ -1,2 +1,2 @@ -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 46507c0..866a556 100644 --- a/stsci.stimage/meta.yaml +++ b/stsci.stimage/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.stimage' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -22,12 +23,12 @@ 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.tools/bld.bat b/stsci.tools/bld.bat index 976d3b9..7fba400 100644 --- a/stsci.tools/bld.bat +++ b/stsci.tools/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/stsci.tools/build.sh b/stsci.tools/build.sh index 4b71885..6bd6081 100644 --- a/stsci.tools/build.sh +++ b/stsci.tools/build.sh @@ -1,2 +1,2 @@ -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 bbb9e05..12c3009 100644 --- a/stsci.tools/meta.yaml +++ b/stsci.tools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.tools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -24,15 +25,15 @@ requirements: - astropy - pytools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - stsci.distutils - pytools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/stsci/bld.bat b/stsci/bld.bat index 3aee3d8..385b56a 100644 --- a/stsci/bld.bat +++ b/stsci/bld.bat @@ -1,2 +1,2 @@ -echo "meta-package"
\ No newline at end of file +echo "meta-package" diff --git a/stsci/build.sh b/stsci/build.sh index 3aee3d8..385b56a 100644 --- a/stsci/build.sh +++ b/stsci/build.sh @@ -1,2 +1,2 @@ -echo "meta-package"
\ No newline at end of file +echo "meta-package" diff --git a/stsci/meta.yaml b/stsci/meta.yaml index e1a90e3..17a78e9 100644 --- a/stsci/meta.yaml +++ b/stsci/meta.yaml @@ -1,8 +1,6 @@ {% set name = 'stsci' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = '0.0.0.dev0' %} +{% set number = '2' %} about: home: http://stsci.edu @@ -18,15 +16,15 @@ package: requirements: run: - - stsci-hst >=*0.0* - - stsci-data-analysis >=*0.0* - - astropy >=*0.0* - - cfitsio >=*0.0* - - ds9 >=*0.0* - - fftw >=*0.0* - - htc_utils >=*0.0* - - purge_path >=*0.0* - - pyds9 >=*0.0* - - pyfftw >=*0.0* + - stsci-hst + - stsci-data-analysis + - astropy + - cfitsio + - ds9 + - fftw + - htc_utils + - purge_path + - pyds9 + - pyfftw - numpy - - python x.x + - python 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 2a053c9..4fb72a8 100644 --- a/stwcs/meta.yaml +++ b/stwcs/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stwcs' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,17 +19,16 @@ package: requirements: build: - - d2to1 - astropy >=1.1 - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git 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 8a72e6f..0000000 --- a/threading2/meta.yaml +++ /dev/null @@ -1,32 +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: threading2 - -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/threading2/{{ 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 0bce59a..0000000 --- a/traceback2/meta.yaml +++ /dev/null @@ -1,38 +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: traceback2 - -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/traceback2/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - traceback2 diff --git a/unixodbc/meta.yaml b/unixodbc/meta.yaml index 2066015..0864f24 100644 --- a/unixodbc/meta.yaml +++ b/unixodbc/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'unixodbc' %} {% set badname = 'unixODBC' %} {% set version = '2.3.4' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://www.unixodbc.org @@ -28,3 +28,4 @@ requirements: source: fn: {{badname}}-{{version}}.tar.gz url: http://www.unixodbc.org/{{badname}}-{{version}}.tar.gz + md5: bd25d261ca1808c947cb687e2034be81 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 e631974..98f10c8 100644 --- a/verhawk/meta.yaml +++ b/verhawk/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'verhawk' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://github.com/spacetelescope/{{ name }} @@ -19,10 +20,10 @@ package: requirements: build: - setuptools - - python x.x + - python {{ python }} run: - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/wcstools/meta.yaml b/wcstools/meta.yaml index 58c48ec..76f1056 100644 --- a/wcstools/meta.yaml +++ b/wcstools/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'wcstools' %} {% set version = '3.9.5' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://tdc-www.harvard.edu/{{ name }} @@ -23,3 +23,4 @@ requirements: source: fn: {{ name }}-{{ version }}.tar.gz url: http://tdc-www.harvard.edu/software/wcstools/{{ name }}-{{ version }}.tar.gz + md5: 30ee0aaa74567805b95c4548e654aa48 diff --git a/webbpsf-data/bld.bat b/webbpsf-data/bld.bat index 794d1ad..c367f9e 100644 --- a/webbpsf-data/bld.bat +++ b/webbpsf-data/bld.bat @@ -1,3 +1,3 @@ echo "Not supported (yet?)" -exit 1
\ No newline at end of file +exit 1 diff --git a/webbpsf-data/build.sh b/webbpsf-data/build.sh index b512892..79745f4 100644 --- a/webbpsf-data/build.sh +++ b/webbpsf-data/build.sh @@ -10,4 +10,4 @@ export WEBBPSF_PATH=$PREFIX/share/webbpsf-data echo " unset WEBBPSF_PATH -" > $PREFIX/etc/conda/deactivate.d/webbpsf-data.sh
\ No newline at end of file +" > $PREFIX/etc/conda/deactivate.d/webbpsf-data.sh diff --git a/webbpsf-data/meta.yaml b/webbpsf-data/meta.yaml index 01e366f..016e0d6 100644 --- a/webbpsf-data/meta.yaml +++ b/webbpsf-data/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'webbpsf-data' %} {% set version = '0.5.0' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://www.stsci.edu/~mperrin/software/webbpsf @@ -17,3 +17,4 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: http://www.stsci.edu/~mperrin/software/webbpsf/{{ name }}-{{ version }}.tar.gz + md5: c1cd63fcb68f97382e5ca5a64f720e46 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..6bd6081 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 diff --git a/webbpsf/meta.yaml b/webbpsf/meta.yaml index d797e79..494429a 100644 --- a/webbpsf/meta.yaml +++ b/webbpsf/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'webbpsf' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} # Keep in mind: # webbpsf-data is version-locked to prevent older builds from picking @@ -26,7 +27,7 @@ requirements: build: - nose - astropy - - numpy + - numpy {{ numpy }} - scipy - matplotlib - poppy @@ -34,7 +35,7 @@ requirements: - six [py27] - webbpsf-data >=0.4.1 - setuptools - - python x.x + - python {{ python }} run: - nose @@ -47,7 +48,7 @@ requirements: - six [py27] - webbpsf-data >=0.4.1 - setuptools - - python x.x + - python source: git_url: https://github.com/mperrin/{{ name }}.git diff --git a/wfc3tools/bld.bat b/wfc3tools/bld.bat index 976d3b9..7fba400 100644 --- a/wfc3tools/bld.bat +++ b/wfc3tools/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/wfc3tools/build.sh b/wfc3tools/build.sh index 10954df..9104e24 100644 --- a/wfc3tools/build.sh +++ b/wfc3tools/build.sh @@ -1,3 +1,3 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/wfc3tools/meta.yaml b/wfc3tools/meta.yaml index 49aad6e..e9415e5 100644 --- a/wfc3tools/meta.yaml +++ b/wfc3tools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'wfc3tools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,22 +19,20 @@ package: requirements: build: - - d2to1 - - stsci.distutils - astropy - matplotlib - scipy - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - - stsci.tools - astropy - matplotlib - numpy - scipy - - python x.x + - stsci.tools + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git diff --git a/wfpc2tools/bld.bat b/wfpc2tools/bld.bat index 976d3b9..7fba400 100644 --- a/wfpc2tools/bld.bat +++ b/wfpc2tools/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/wfpc2tools/build.sh b/wfpc2tools/build.sh index 5b1a523..d8b4616 100644 --- a/wfpc2tools/build.sh +++ b/wfpc2tools/build.sh @@ -25,4 +25,4 @@ if [ $PY3K -ne 0 ] ; then 2to3 -w . fi -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/wfpc2tools/meta.yaml b/wfpc2tools/meta.yaml index 56e66cf..337e85b 100644 --- a/wfpc2tools/meta.yaml +++ b/wfpc2tools/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'wfpc2tools' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -25,15 +26,15 @@ requirements: - stsci.imagestats - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - 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 5cec403..0000000 --- a/ws4py/meta.yaml +++ /dev/null @@ -1,32 +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: ws4py - -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/ws4py/{{ name }}-{{ version }}.tar.gz - -test: - imports: - - ws4py diff --git a/xpa/bld.bat b/xpa/bld.bat index 60d77ab..f63e097 100644 --- a/xpa/bld.bat +++ b/xpa/bld.bat @@ -1,3 +1,3 @@ echo Nope -exit 1
\ No newline at end of file +exit 1 diff --git a/xpa/build.sh b/xpa/build.sh index 60e0175..e9948fd 100644 --- a/xpa/build.sh +++ b/xpa/build.sh @@ -4,4 +4,4 @@ rm -rf python ./configure --prefix=$PREFIX \ --enable-shared make -j${CPU_COUNT} -make install || exit 1
\ No newline at end of file +make install diff --git a/xpa/meta.yaml b/xpa/meta.yaml index 479a70c..e4507b2 100644 --- a/xpa/meta.yaml +++ b/xpa/meta.yaml @@ -1,20 +1,25 @@ {% set name = 'xpa' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/ericmandel/{{ name }} license: MIT summary: Provides seamless communication between many kinds of Unix programs + build: number: {{ number }} + package: name: {{ name }} version: {{ version }} + source: git_url: https://github.com/ericmandel/{{ name }}.git + test: commands: - test -x `which xpaget` 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 608e9ca..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: yolk - -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/yolk/{{ name }}-{{ version }}.tar.gz -test: - commands: - - yolk |