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.stimage | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'stsci.stimage')
| -rw-r--r-- | stsci.stimage/bld.bat | 8 | ||||
| -rw-r--r-- | stsci.stimage/build.sh | 5 | ||||
| -rw-r--r-- | stsci.stimage/meta.yaml | 11 |
3 files changed, 9 insertions, 15 deletions
diff --git a/stsci.stimage/bld.bat b/stsci.stimage/bld.bat index 2096589..39b5e1f 100644 --- a/stsci.stimage/bld.bat +++ b/stsci.stimage/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.stimage/build.sh b/stsci.stimage/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.stimage/build.sh +++ b/stsci.stimage/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.stimage/meta.yaml b/stsci.stimage/meta.yaml index 78b6131..80c3c4a 100644 --- a/stsci.stimage/meta.yaml +++ b/stsci.stimage/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'stsci.stimage' %} {% set version = '0.2.1' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,13 +21,13 @@ package: requirements: build: - d2to1 - - numpy + - numpy {{ numpy }} - stsci.distutils - setuptools - - python x.x + - python {{ python }} run: - numpy - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git |