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 /wfpc2tools | |
| 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 'wfpc2tools')
| -rw-r--r-- | wfpc2tools/bld.bat | 7 | ||||
| -rw-r--r-- | wfpc2tools/build.sh | 30 | ||||
| -rw-r--r-- | wfpc2tools/meta.yaml | 11 |
3 files changed, 9 insertions, 39 deletions
diff --git a/wfpc2tools/bld.bat b/wfpc2tools/bld.bat index 695f708..39b5e1f 100644 --- a/wfpc2tools/bld.bat +++ b/wfpc2tools/bld.bat @@ -1,6 +1 @@ - -pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 - -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/wfpc2tools/build.sh b/wfpc2tools/build.sh index 5626890..5a5aeeb 100644 --- a/wfpc2tools/build.sh +++ b/wfpc2tools/build.sh @@ -1,29 +1 @@ - -function get_py_version() { -python --version 2>&1| awk '{sub(/-.*/,"",$2);print $2}' -} -export -f get_py_version - -function set_py3k() { - version=`get_py_version` - major=`echo $version | cut -d '.' -f 1` - minor=`echo $version | cut -d '.' -f 2` - hotfix=`echo $version | cut -d '.' -f 3` - if (( major > 2 )); then - export PY3K=1 - else - export PY3K=0 - fi -} -export -f set_py3k - -set_py3k - -pip install --no-deps --upgrade --force d2to1 || exit 1 - -echo "This doesn't work. Why conda why? --python 2.7 is useless here" -if [ $PY3K -ne 0 ] ; then -sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg -fi - -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/wfpc2tools/meta.yaml b/wfpc2tools/meta.yaml index 8cc9422..75e0d48 100644 --- a/wfpc2tools/meta.yaml +++ b/wfpc2tools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'wfpc2tools' %} {% set version = '1.0.3' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -24,15 +27,15 @@ requirements: - stsci.imagestats - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - scipy - stsci.imagestats - stsci.tools - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git |