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.tools | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'stsci.tools')
| -rw-r--r-- | stsci.tools/bld.bat | 8 | ||||
| -rw-r--r-- | stsci.tools/build.sh | 5 | ||||
| -rw-r--r-- | stsci.tools/meta.yaml | 18 |
3 files changed, 11 insertions, 20 deletions
diff --git a/stsci.tools/bld.bat b/stsci.tools/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.tools/bld.bat +++ b/stsci.tools/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 -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 5e8b365..5a5aeeb 100644 --- a/stsci.tools/build.sh +++ b/stsci.tools/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/stsci.tools/meta.yaml b/stsci.tools/meta.yaml index 3581c7c..c047e3a 100644 --- a/stsci.tools/meta.yaml +++ b/stsci.tools/meta.yaml @@ -1,5 +1,8 @@ {% set name = 'stsci.tools' %} -{% set version = '3.4.11' %} +{% set version = '3.4.12' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set number = '0' %} about: @@ -18,19 +21,16 @@ package: requirements: build: - - d2to1 - astropy >=1.1 - - pytools - setuptools - - stsci.distutils - - numpy - - python x.x + - pytest-runner + - numpy {{ numpy }} + - python {{ python }} + run: - astropy >=1.1 - numpy - - pytools - - stsci.distutils - - python x.x + - python source: git_tag: {{ version }} |