From 5306615c6cee215b244c7685c7f852e60053a4a9 Mon Sep 17 00:00:00 2001
From: "P. L. Lim" <lim@stsci.edu>
Date: Sun, 25 Dec 2016 10:37:10 -0500
Subject: Bump Ginga to 2.6.1 (#127)

---
 ginga/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ginga')

diff --git a/ginga/meta.yaml b/ginga/meta.yaml
index 5276822..2dea4e3 100644
--- a/ginga/meta.yaml
+++ b/ginga/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = 'ginga' %}
-{% set version = 'v2.6.0' %}
+{% set version = 'v2.6.1' %}
 {% set number = '0' %}
 about:
     home: https://github.com/ejeschke/{{ name }}
-- 
cgit 


From 90bccc38e9beb17674d6243848f1403eed69c273 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@users.noreply.github.com>
Date: Tue, 27 Dec 2016 22:44:41 -0600
Subject: Add missing qtpy dep; Fix version/tag usage (#128)

---
 ginga/meta.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ginga')

diff --git a/ginga/meta.yaml b/ginga/meta.yaml
index 2dea4e3..eb0cbd6 100644
--- a/ginga/meta.yaml
+++ b/ginga/meta.yaml
@@ -1,5 +1,6 @@
 {% set name = 'ginga' %}
-{% set version = 'v2.6.1' %}
+{% set version = '2.6.1' %}
+{% set tag = 'v' + version %}
 {% set number = '0' %}
 about:
     home: https://github.com/ejeschke/{{ name }}
@@ -13,15 +14,17 @@ package:
 requirements:
     build:
     - astropy >=1.2
+    - qtpy
     - setuptools
     - numpy x.x
     - python x.x
     run:
     - astropy >=1.2
+    - qtpy
     - numpy x.x
     - python x.x
 source:
-    git_tag: {{ version }}
+    git_tag: {{ tag }}
     git_url: https://github.com/ejeschke/{{ name }}.git
 test:
     commands:
-- 
cgit