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 /pyraf | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'pyraf')
| -rw-r--r-- | pyraf/bld.bat | 4 | ||||
| -rw-r--r-- | pyraf/build.sh | 2 | ||||
| -rw-r--r-- | pyraf/meta.yaml | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pyraf/bld.bat b/pyraf/bld.bat index 976d3b9..7fba400 100644 --- a/pyraf/bld.bat +++ b/pyraf/bld.bat @@ -1,5 +1,3 @@ -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/pyraf/build.sh b/pyraf/build.sh index 3974e86..08480f2 100644 --- a/pyraf/build.sh +++ b/pyraf/build.sh @@ -12,4 +12,4 @@ set +e fi fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml index 2380480..232be5d 100644 --- a/pyraf/meta.yaml +++ b/pyraf/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyraf' %} {% set version = '2.1.11' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '3' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -18,6 +21,7 @@ package: requirements: build: - d2to1 + - stsci.distutils - astropy >=1.1 - ipython - matplotlib @@ -26,8 +30,8 @@ requirements: - pyobjc-framework-quartz >=3.0.4 [osx] - stsci.tools - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - ipython @@ -37,7 +41,7 @@ requirements: - pyobjc-framework-quartz >=3.0.4 [osx] - stsci.tools - numpy - - python x.x + - python source: git_tag: {{ version }} |