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 /synphot | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'synphot')
| -rw-r--r-- | synphot/bld.bat | 3 | ||||
| -rw-r--r-- | synphot/build.sh | 2 | ||||
| -rw-r--r-- | synphot/meta.yaml | 11 |
3 files changed, 9 insertions, 7 deletions
diff --git a/synphot/bld.bat b/synphot/bld.bat index 98bf5c5..39b5e1f 100644 --- a/synphot/bld.bat +++ b/synphot/bld.bat @@ -1,2 +1 @@ -python setup.py install || exit 1 -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/synphot/build.sh b/synphot/build.sh index 5c61be1..5a5aeeb 100644 --- a/synphot/build.sh +++ b/synphot/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/synphot/meta.yaml b/synphot/meta.yaml index 6b6ed1d..e7d31b5 100644 --- a/synphot/meta.yaml +++ b/synphot/meta.yaml @@ -1,7 +1,10 @@ {% set reponame = 'synphot_refactor' %} {% set name = 'synphot' %} {% set version = '0.1' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ reponame }} @@ -19,16 +22,16 @@ requirements: build: - astropy >=1.3 - scipy >=0.14 - - numpy + - numpy {{ numpy }} - pytest - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.3 - scipy >=0.14 - numpy - pytest - - python x.x + - python source: git_tag: {{ version }} |