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 /webbpsf | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'webbpsf')
| -rw-r--r-- | webbpsf/bld.bat | 3 | ||||
| -rw-r--r-- | webbpsf/build.sh | 2 | ||||
| -rw-r--r-- | webbpsf/meta.yaml | 11 |
3 files changed, 9 insertions, 7 deletions
diff --git a/webbpsf/bld.bat b/webbpsf/bld.bat index b290566..760380e 100644 --- a/webbpsf/bld.bat +++ b/webbpsf/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/webbpsf/build.sh b/webbpsf/build.sh index 4b71885..56f0b30 100644 --- a/webbpsf/build.sh +++ b/webbpsf/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install
\ No newline at end of file diff --git a/webbpsf/meta.yaml b/webbpsf/meta.yaml index 859f352..e5e736c 100644 --- a/webbpsf/meta.yaml +++ b/webbpsf/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'webbpsf' %} {% set version = '0.6.0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://webbpsf.readthedocs.io @@ -20,14 +23,14 @@ package: requirements: build: - astropy >=1.1 - - numpy + - numpy {{ numpy }} - scipy - matplotlib - poppy >=0.6.1 - six [py27] - webbpsf-data ==0.6.0 - setuptools - - python x.x + - python {{ python }} - ipywidgets - jwxml run: @@ -39,7 +42,7 @@ requirements: - six [py27] - webbpsf-data ==0.6.0 - setuptools - - python x.x + - python - ipywidgets - jwxml |