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 /stsci.skypac | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'stsci.skypac')
| -rw-r--r-- | stsci.skypac/bld.bat | 3 | ||||
| -rw-r--r-- | stsci.skypac/build.sh | 28 | ||||
| -rw-r--r-- | stsci.skypac/meta.yaml | 12 |
3 files changed, 10 insertions, 33 deletions
diff --git a/stsci.skypac/bld.bat b/stsci.skypac/bld.bat index 8d766c9..760380e 100644 --- a/stsci.skypac/bld.bat +++ b/stsci.skypac/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/stsci.skypac/build.sh b/stsci.skypac/build.sh index 1032cc4..5a5aeeb 100644 --- a/stsci.skypac/build.sh +++ b/stsci.skypac/build.sh @@ -1,27 +1 @@ - -function get_py_version() { -python --version 2>&1| awk '{sub(/-.*/,"",$2);print $2}' -} -export -f get_py_version - -function set_py3k() { -version=`get_py_version` -major=`echo $version | cut -d '.' -f 1` -minor=`echo $version | cut -d '.' -f 2` -hotfix=`echo $version | cut -d '.' -f 3` -if (( major > 2 )); then -export PY3K=1 -else -export PY3K=0 -fi -} -export -f set_py3k - -set_py3k - - -pip install --no-deps --upgrade --force d2to1 -if [ $PY3K -ne 0 ] ; then -sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg -fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml index cc6036c..af1998a 100644 --- a/stsci.skypac/meta.yaml +++ b/stsci.skypac/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.skypac' %} {% set version = '0.9.8' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -17,6 +20,7 @@ package: requirements: build: + - d2to1 - astropy >=1.1 - stsci.distutils - stsci.imagestats @@ -24,15 +28,15 @@ requirements: - stsci.tools - stwcs - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - stsci.imagestats - stsci.sphere - stsci.tools - stwcs - - python x.x + - python source: git_tag: {{ version }} |