From 440ebee4f0f79b47e9e936e4851673c5189c6572 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Sat, 18 Feb 2017 15:09:47 +0000 Subject: Update glueviz to 0.10 and glue-vispy-viewers to 0.7.1 (#171) --- glueviz/meta.yaml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'glueviz') 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 -- cgit From ec4b5c17bf7546e911ea8e5f4bb82942367a7c0e Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Thu, 9 Mar 2017 11:38:08 -0500 Subject: Remove circular dependency from glueviz; add pyopengl build dependency to glue-vispy-viewers; bump build number --- glueviz/meta.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index 93da6fc..711147d 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -44,7 +44,6 @@ requirements: - ipykernel - qtconsole - dill >=0.2 - - glue-vispy-viewers >=0.6 - xlrd >=1.0 - h5py >=2.4 - setuptools >=1.0 -- cgit 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 From 19e8a9dfcb8260ba49491b041f09d5ffbbd60ae4 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Thu, 1 Jun 2017 16:35:23 +0100 Subject: Updated recipes for glue, glue-vispy-viewers and glueviz --- glueviz/meta.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index 739e013..5ec75a6 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -3,24 +3,33 @@ # app: entry here and not in the glue-core package. {% set name = 'glueviz' %} -{% set version = '0.10.1' %} +{% set version = '0.11.0' %} {% set number = '0' %} package: name: {{ name }} version: {{ version }} +source: + fn: {{ name }}-{{ version }}.tar.gz + url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz + md5: 03954cd633bd7be25472d529034cb8fb + build: number: {{ number }} + script: python setup.py install --single-version-externally-managed --record record.txt requirements: build: - python - setuptools - - glue-vispy-viewers >=0.7.2 + - glue-core >=0.11.0 + - glue-vispy-viewers >=0.8 + - glue-ginga run: - - glue-vispy-viewers >=0.7.2 + - glue-core >=0.11.0 + - glue-vispy-viewers >=0.8 - glue-ginga app: -- cgit From 607a08dfe4d9f495655d9ffbe9e2609e1e84891d Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Thu, 7 Sep 2017 17:05:39 +0100 Subject: Update to v0.11.1 --- glueviz/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index 5ec75a6..343abf7 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -3,7 +3,7 @@ # app: entry here and not in the glue-core package. {% set name = 'glueviz' %} -{% set version = '0.11.0' %} +{% set version = '0.11.1' %} {% set number = '0' %} package: @@ -13,7 +13,7 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz - md5: 03954cd633bd7be25472d529034cb8fb + sha256: 3d5c3ea90d78d3186ff60ff8094e3c0b09c6e040d94210d29a8370a60aa134d5 build: number: {{ number }} @@ -23,12 +23,12 @@ requirements: build: - python - setuptools - - glue-core >=0.11.0 + - glue-core >=0.11.1 - glue-vispy-viewers >=0.8 - glue-ginga run: - - glue-core >=0.11.0 + - glue-core >=0.11.1 - glue-vispy-viewers >=0.8 - glue-ginga -- cgit From 61821afa087a820a75200c448eb1bb0909fdeb11 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Fri, 15 Sep 2017 11:04:34 -0400 Subject: * Fix circular dependency; remove metapackage build requirements * Increment build numbers --- glueviz/meta.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index 343abf7..cea8e5b 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -4,7 +4,7 @@ {% set name = 'glueviz' %} {% set version = '0.11.1' %} -{% set number = '0' %} +{% set number = '1' %} package: name: {{ name }} @@ -20,13 +20,6 @@ build: script: python setup.py install --single-version-externally-managed --record record.txt requirements: - build: - - python - - setuptools - - glue-core >=0.11.1 - - glue-vispy-viewers >=0.8 - - glue-ginga - run: - glue-core >=0.11.1 - glue-vispy-viewers >=0.8 -- cgit From cf79fd8a20a0b4a10c5b533e48e9a1e0a0b5dc4f Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Wed, 25 Oct 2017 13:23:08 -0400 Subject: Updated glueviz to v0.12.0 --- glueviz/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'glueviz') diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index cea8e5b..6657d4a 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -3,8 +3,8 @@ # app: entry here and not in the glue-core package. {% set name = 'glueviz' %} -{% set version = '0.11.1' %} -{% set number = '1' %} +{% set version = '0.12.0' %} +{% set number = '0' %} package: name: {{ name }} @@ -13,7 +13,7 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 3d5c3ea90d78d3186ff60ff8094e3c0b09c6e040d94210d29a8370a60aa134d5 + sha256: 4b41b9bb41d88567e9fef76af545059ba9bb6c3a3645a07619fa5b1b47adbc5e build: number: {{ number }} @@ -21,8 +21,8 @@ build: requirements: run: - - glue-core >=0.11.1 - - glue-vispy-viewers >=0.8 + - glue-core >=0.12 + - glue-vispy-viewers >=0.9 - glue-ginga app: -- cgit