diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-02-22 08:53:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 08:53:06 -0500 |
| commit | d4ccb57a335dfda4b3583107767a081691352b2f (patch) | |
| tree | 43dd1892560bcc467c5eaf1373390cefe4707acd /wfpc2tools | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
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 |