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 /mosviz | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'mosviz')
| -rw-r--r-- | mosviz/build.sh | 4 | ||||
| -rw-r--r-- | mosviz/meta.yaml | 21 | 
2 files changed, 12 insertions, 13 deletions
| diff --git a/mosviz/build.sh b/mosviz/build.sh index 2291246..5a5aeeb 100644 --- a/mosviz/build.sh +++ b/mosviz/build.sh @@ -1,5 +1 @@ -# Remove reference to glueviz from setup script, since this breaks the build -# as there is no file containing 'glueviz' produced for that package since -# glueviz has become a metapackage. -sed -i -e "/'glueviz.*',$/d" setup.py  $PYTHON setup.py install diff --git a/mosviz/meta.yaml b/mosviz/meta.yaml index 3d1ce69..71b47e3 100644 --- a/mosviz/meta.yaml +++ b/mosviz/meta.yaml @@ -1,7 +1,10 @@  {% set name = 'mosviz' %}  {% set version = '0.1.1' %} +{% if version[0] == 'v' %} +{%   set version = version[1:] %} +{% endif %}  {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %}  about:    home: https://github.com/spacetelescope/mosviz @@ -23,24 +26,24 @@ source:  requirements:    build:      - astropy -    - specutils -    - glueviz >=0.9.0 +    - glue-core >=0.11.0      - matplotlib >=1.5.3 -    - numpy -    - python x.x +    - specutils <=0.2.2 +    - numpy {{ numpy }} +    - python {{ python }}    run:      - astropy -    - specutils -    - glueviz >=0.9.0 +    - glue-core >=0.11.0      - matplotlib >=1.5.3 +    - specutils <=0.2.2      - numpy -    - python x.x +    - python  test:    requires:      - astropy -    - specutils +    - specutils <=0.2.2    imports:      - mosviz | 
