diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2018-02-14 16:04:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 16:04:22 -0500 |
| commit | 000f9fe943522e54fcfd0910711bfdbde8785e3b (patch) | |
| tree | bc1fe80a8a74668743a3b6c8cef29733debe621a /drizzlepac | |
| parent | b42445476e8dafef90f7190a9fbf20ef94c1ba78 (diff) | |
| download | astroconda-contrib-000f9fe943522e54fcfd0910711bfdbde8785e3b.tar.gz | |
Next (#292)
* Strip x.x selectors
* Assign build-time python lock
* Minimal build matrix
* Numpy locking
* Force -m64 on darwin
* ds9: add md5 hash
* stsci: Remove build section
* Replace python calls with env variable; Strip redundant exit conditions
* Remove dead packages
* sextractor: Use Intel MKL
* Use autotools whatever the platform; Switch URL to github mirror (astromatic is too slow)
* Force linkage against Intel OpenMP
Signed-off-by: Joseph Hunkeler <jhunkeler@gmail.com>
* Add version guard template
* Remove dead sextractor package
* Bump all build revisions
* Remove recipes that exist in defaults or no longer serve a purpose
* Fixup mosviz requirements
* Remove purge_path usage
* Remove glue* recipes (favor defaults channel)
* Remove pydrizzle
* Replace glueviz requirement with glue-core
* Remove pytools
* Remove pytools dependency
* Adjust specviz requirements
* pyregion moved to astropy org
* Fix d2to1 dependency
* Remove d2to1 pip calls
* Remove deprecated stsci_sphinx_theme
Diffstat (limited to 'drizzlepac')
| -rw-r--r-- | drizzlepac/bld.bat | 8 | ||||
| -rw-r--r-- | drizzlepac/build.sh | 5 | ||||
| -rw-r--r-- | drizzlepac/meta.yaml | 11 |
3 files changed, 9 insertions, 15 deletions
diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat index d1ddf28..39b5e1f 100644 --- a/drizzlepac/bld.bat +++ b/drizzlepac/bld.bat @@ -1,7 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 - -python setup.py install || exit 1 -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/drizzlepac/build.sh b/drizzlepac/build.sh index 3bc9ae7..5a5aeeb 100644 --- a/drizzlepac/build.sh +++ b/drizzlepac/build.sh @@ -1,4 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 || exit 1 -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml index 78e3347..15b0800 100644 --- a/drizzlepac/meta.yaml +++ b/drizzlepac/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'drizzlepac' %} {% set version = '2.1.21' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -19,7 +22,7 @@ requirements: - astropy >=1.1 - fitsblender - nictools - - numpy + - numpy {{ numpy }} - scipy - stsci.convolve - stsci.distutils @@ -33,7 +36,7 @@ requirements: - stsci.tools - stwcs - pyregion - - python x.x + - python {{ python }} - setuptools run: - astropy >=1.1 @@ -53,7 +56,7 @@ requirements: - stwcs - pyregion - setuptools - - python x.x + - python source: git_tag: {{ version }} |