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 /drizzlepac | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'drizzlepac')
| -rw-r--r-- | drizzlepac/bld.bat | 8 | ||||
| -rw-r--r-- | drizzlepac/build.sh | 5 | ||||
| -rw-r--r-- | drizzlepac/meta.yaml | 13 |
3 files changed, 11 insertions, 15 deletions
diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat index d1ddf28..39b5e1f 100644 --- a/drizzlepac/bld.bat +++ b/drizzlepac/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 || exit 1 -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/drizzlepac/build.sh b/drizzlepac/build.sh index 3bc9ae7..5a5aeeb 100644 --- a/drizzlepac/build.sh +++ b/drizzlepac/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 +$PYTHON setup.py install diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml index 78e3347..f2e4cb3 100644 --- a/drizzlepac/meta.yaml +++ b/drizzlepac/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'drizzlepac' %} {% set version = '2.1.21' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -16,10 +19,12 @@ package: requirements: build: + - d2to1 + - stsci.distutils - astropy >=1.1 - fitsblender - nictools - - numpy + - numpy {{ numpy }} - scipy - stsci.convolve - stsci.distutils @@ -33,7 +38,7 @@ requirements: - stsci.tools - stwcs - pyregion - - python x.x + - python {{ python }} - setuptools run: - astropy >=1.1 @@ -53,7 +58,7 @@ requirements: - stwcs - pyregion - setuptools - - python x.x + - python source: git_tag: {{ version }} |