summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Robitaille <thomas.robitaille@gmail.com>2017-02-18 10:09:47 -0500
committerJoseph Hunkeler <jhunkeler@users.noreply.github.com>2017-02-18 10:09:47 -0500
commit440ebee4f0f79b47e9e936e4851673c5189c6572 (patch)
treead62eb287b1a0c558093d41033340e7439e2a49b
parent752fa9990622c30de146c4aea2e22ec6d1725325 (diff)
downloadastroconda-contrib-440ebee4f0f79b47e9e936e4851673c5189c6572.tar.gz
Update glueviz to 0.10 and glue-vispy-viewers to 0.7.1 (#171)
-rw-r--r--glue-vispy-viewers/meta.yaml16
-rw-r--r--glueviz/meta.yaml33
2 files changed, 27 insertions, 22 deletions
diff --git a/glue-vispy-viewers/meta.yaml b/glue-vispy-viewers/meta.yaml
index d7137ca..0350c89 100644
--- a/glue-vispy-viewers/meta.yaml
+++ b/glue-vispy-viewers/meta.yaml
@@ -1,5 +1,5 @@
{% set name = 'glue-vispy-viewers' %}
-{% set version = "0.6" %}
+{% set version = "0.7.1" %}
{% set number = '0' %}
package:
@@ -9,7 +9,7 @@ package:
source:
fn: {{ name }}-{{ version }}.tar.gz
url: https://pypi.io/packages/source/g/glue-vispy-viewers/{{ name }}-{{ version }}.tar.gz
- md5: 07b0ec9fec510352edc617e95ee86469
+ md5: 2189493a5070024ff3c412307a6a5a7e
build:
number: {{ number }}
@@ -21,16 +21,20 @@ requirements:
- python
- setuptools
- run:
+run:
- python
- numpy
- pyopengl
- - glueviz >=0.9
+ - glueviz >=0.10
- scikit-image
- matplotlib
- qtpy
- pyqt
+ # Temporary: the scikit-image conda package is missing the dask dependency
+ # so we add it here for now
+ - dask
+
test:
imports:
- glue_vispy_viewers
@@ -41,7 +45,3 @@ about:
home: https://github.com/glue-viz/glue-vispy-viewers
license: BSD 3-Clause
summary: 3D viewers for Glue
-
-extra:
- recipe-maintainers:
- - astrofrog
diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml
index 3fd327d..93da6fc 100644
--- a/glueviz/meta.yaml
+++ b/glueviz/meta.yaml
@@ -1,5 +1,5 @@
{% set name = 'glueviz' %}
-{% set version = '0.9.1' %}
+{% set version = '0.10.0' %}
{% set number = '0' %}
package:
@@ -9,11 +9,15 @@ package:
source:
fn: {{ name }}-{{ version }}.tar.gz
url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz
- md5: 365887017580e243fb008d8109f2bc16
+ md5: 1bdd8b6925fb028938ee3affd7b95059
build:
number: {{ number }}
script: python setup.py install --single-version-externally-managed --record record.txt
+ entry_points:
+ - glue = glue.main:main
+ - glue-config = glue.config_gen:main
+ - glue-deps = glue._deps:main
osx_is_app: True
requirements:
@@ -21,6 +25,7 @@ requirements:
build:
- python
- setuptools
+ - pyqt
run:
@@ -32,23 +37,27 @@ requirements:
- python
- numpy >=1.9
- pandas >=0.14
- - astropy >=1
+ - astropy >=1.3
- matplotlib >=1.4
- qtpy >=1.1.1
+ - ipython >=4.0
+ - ipykernel
+ - qtconsole
+ - dill >=0.2
+ - glue-vispy-viewers >=0.6
+ - xlrd >=1.0
+ - h5py >=2.4
- setuptools >=1.0
- pyqt
# Optional dependencies (defined in ``extras_require``)
- - dill
- - h5py
- scipy
- scikit-image
- - ipython >=1
- - ipykernel
- - qtconsole
- plotly
- - xlrd
- - glue-vispy-viewers >=0.5
+
+ # Temporary: the scikit-image conda package is missing the dask dependency
+ # so we add it here for now
+ - dask
test:
imports:
@@ -70,7 +79,3 @@ about:
license: BSD 3-Clause
license_file: LICENSE
summary: Multi-dimensional linked data exploration
-
-extra:
- recipe-maintainers:
- - astrofrog