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 /calcos | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'calcos')
| -rw-r--r-- | calcos/bld.bat | 3 | ||||
| -rw-r--r-- | calcos/build.sh | 4 | ||||
| -rw-r--r-- | calcos/meta.yaml | 11 |
3 files changed, 9 insertions, 9 deletions
diff --git a/calcos/bld.bat b/calcos/bld.bat index 5d42b68..7fba400 100644 --- a/calcos/bld.bat +++ b/calcos/bld.bat @@ -1,4 +1,3 @@ -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/calcos/build.sh b/calcos/build.sh index 52582b9..b442f84 100644 --- a/calcos/build.sh +++ b/calcos/build.sh @@ -1,4 +1,2 @@ - -pip install --no-deps --upgrade --force d2to1 sed -i -e 's|pyfits.*|astropy (>=0.3.1)|' setup.cfg -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/calcos/meta.yaml b/calcos/meta.yaml index 8e139e0..1243415 100644 --- a/calcos/meta.yaml +++ b/calcos/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'calcos' %} {% set version = '3.2.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,14 +24,14 @@ requirements: - stsci.distutils - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - scipy - stsci.tools - numpy - - python x.x + - python source: git_tag: {{ version }} |