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 /crds | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'crds')
| -rw-r--r-- | crds/bld.bat | 3 | ||||
| -rw-r--r-- | crds/build.sh | 2 | ||||
| -rw-r--r-- | crds/meta.yaml | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/crds/bld.bat b/crds/bld.bat index 5d42b68..7fba400 100644 --- a/crds/bld.bat +++ b/crds/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/crds/build.sh b/crds/build.sh index 762d43b..5a5aeeb 100644 --- a/crds/build.sh +++ b/crds/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/crds/meta.yaml b/crds/meta.yaml index 6e639ea..88f28b5 100644 --- a/crds/meta.yaml +++ b/crds/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'crds' %} {% set version = '7.1.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://www.stsci.edu/hst/observatory/crds/ @@ -21,13 +24,13 @@ requirements: build: - astropy >=1.1 - cfitsio - - numpy + - numpy {{ numpy }} - requests - lxml - parsley - setuptools - lockfile - - python + - python {{ python }} run: - astropy >=1.1 |