From fdcc9deed0b7eb88fe47b53884854d4a2073a8d9 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Thu, 16 Mar 2017 17:53:22 +0000 Subject: Updated glue-vispy-viewers to 0.7.2 Updated glue-core (formerly glueviz) to 0.10.1 Added glueviz metapackage --- glueviz/meta.yaml | 48 +++++++++--------------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index 711147d..e3c201b 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -1,5 +1,9 @@ +# NOTE: this is a meta-package that includes the core glue code as well as stable +# plugins. This is the main conda package we want in the Navigator, so we add the +# app: entry here and not in the glue-core package. + {% set name = 'glueviz' %} -{% set version = '0.10.0' %} +{% set version = '0.10.1' %} {% set number = '0' %} package: @@ -9,54 +13,20 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz - md5: 1bdd8b6925fb028938ee3affd7b95059 + md5: abcb117e102ae9cb00c5dd1bd784c5f3 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: build: - python - setuptools - - pyqt run: - - # The following is needed to make sure that the package works as a GUI - # application (glue needs to be run with python.app, not python) - - python.app # [osx] - - # Required dependencies - - python - - numpy >=1.9 - - pandas >=0.14 - - astropy >=1.3 - - matplotlib >=1.4 - - qtpy >=1.1.1 - - ipython >=4.0 - - ipykernel - - qtconsole - - dill >=0.2 - - xlrd >=1.0 - - h5py >=2.4 - - setuptools >=1.0 - - pyqt - - # Optional dependencies (defined in ``extras_require``) - - scipy - - scikit-image - - plotly - - # Temporary: the scikit-image conda package is missing the dask dependency - # so we add it here for now - - dask + - glue-core >=0.10.1 + - glue-vispy-viewers >=0.7.2 test: imports: @@ -76,5 +46,5 @@ app: about: home: http://glueviz.org license: BSD 3-Clause - license_file: LICENSE + #license_file: LICENSE summary: Multi-dimensional linked data exploration -- cgit From a9d0eb237e861d065effc931d779079eb01ef9d6 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Thu, 16 Mar 2017 18:13:54 +0000 Subject: Add glue-ginga to glueviz meta-package --- glueviz/meta.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index e3c201b..a852389 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -27,6 +27,7 @@ requirements: run: - glue-core >=0.10.1 - glue-vispy-viewers >=0.7.2 + - glue-ginga test: imports: -- cgit From 0f73bf50cf7c1af435612734a31f5d5bdc62048f Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Mon, 20 Mar 2017 15:03:14 -0400 Subject: Update meta.yaml Adjusted to clean up and to prevent undesired multiple builds of glue-core (under investigation as a potential problem with conda-build's dependency resolution behavior). --- glueviz/meta.yaml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index a852389..739e013 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -10,34 +10,19 @@ package: name: {{ name }} version: {{ version }} -source: - fn: {{ name }}-{{ version }}.tar.gz - url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz - md5: abcb117e102ae9cb00c5dd1bd784c5f3 - build: number: {{ number }} requirements: - build: - python - setuptools + - glue-vispy-viewers >=0.7.2 run: - - glue-core >=0.10.1 - glue-vispy-viewers >=0.7.2 - glue-ginga -test: - imports: - - glue - - glue.core - - glue.app.qt - commands: - - glue --version - - glue-deps list - app: entry: glue icon: logo.png @@ -47,5 +32,4 @@ app: about: home: http://glueviz.org license: BSD 3-Clause - #license_file: LICENSE summary: Multi-dimensional linked data exploration -- cgit