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 /poppy | |
| 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 'poppy')
| -rw-r--r-- | poppy/meta.yaml | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/poppy/meta.yaml b/poppy/meta.yaml index 972d36c..52ce202 100644 --- a/poppy/meta.yaml +++ b/poppy/meta.yaml @@ -1,7 +1,7 @@  {% set name = 'poppy' %} -{% set version = '0.6.1' %} +{% set version = '0.7.0' %}  {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '0' %}  about:      home: https://github.com/mperrin/{{ name }} @@ -19,20 +19,20 @@ package:  requirements:      build: -    - astropy >=1.1 +    - astropy >=1.3      - numpy {{ numpy }} -    - scipy -    - matplotlib -    - six [py27] +    - scipy >=0.14.0 +    - matplotlib >=1.3.0 +    - six      - enum34 [py27]      - setuptools      - python {{ python }}      run:      - astropy >=1.1      - numpy -    - scipy -    - matplotlib -    - six [py27] +    - scipy >=0.14.0 +    - matplotlib >=1.3.0 +    - six      - enum34 [py27]      - setuptools      - python | 
