diff options
| author | Todd Miller <jmiller@stsci.edu> | 2018-06-22 09:10:14 -0400 |
|---|---|---|
| committer | Todd Miller <jmiller@stsci.edu> | 2018-06-22 09:10:14 -0400 |
| commit | ff7bb35c63ef298df2207dbfdc49e441cec0e2ae (patch) | |
| tree | 7cb17a5919c32a5aae5f627a77a0db239d6d19af /webbpsf | |
| parent | e3ccb95b25b6a978e8e2da7783cc53ec6b2d698a (diff) | |
| parent | f6dbc50fd6569c11c4b0286f4d30a08a56b8463e (diff) | |
| download | astroconda-contrib-ff7bb35c63ef298df2207dbfdc49e441cec0e2ae.tar.gz | |
Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into update-crds-version to resolve version conflicts.
Diffstat (limited to 'webbpsf')
| -rw-r--r-- | webbpsf/meta.yaml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/webbpsf/meta.yaml b/webbpsf/meta.yaml index ae4f237..1c0ba1e 100644 --- a/webbpsf/meta.yaml +++ b/webbpsf/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'webbpsf' %} -{% set version = '0.6.0' %} +{% set version = '0.7.0' %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '0' %} about: home: https://webbpsf.readthedocs.io @@ -19,29 +19,31 @@ package: requirements: build: - - astropy >=1.1 + - astropy >=1.2 - numpy {{ numpy }} - - scipy - - matplotlib - - poppy >=0.6.1 - - six [py27] - - webbpsf-data ==0.6.0 + - scipy >=0.16.0 + - matplotlib >=1.5.0 + - poppy >=0.7.0 + - six + - webbpsf-data ==0.7.0 - setuptools - python {{ python }} - ipywidgets - jwxml + - pysiaf >=0.1.8 run: - - astropy >=1.1 - - numpy - - scipy - - matplotlib - - poppy >=0.6.1 - - six [py27] + - astropy >=1.2 + - numpy {{numpy}} + - scipy >=0.16.0 + - matplotlib >=1.5.0 + - poppy >=0.7.0 + - six - webbpsf-data ==0.6.0 - setuptools - python - ipywidgets - jwxml + - pysiaf >=0.1.8 source: git_tag: {{ tag }} |