[seaborn] 01/01: Fix recent FTBFS caused by test failures

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository seaborn.

commit f0b1a89280d11f617d4b3d01a2ff43758e9d1769
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jan 23 12:21:09 2017 +0100

    Fix recent FTBFS caused by test failures
    
    Added Allow-matplotlib-to-return-an-rgba-tuple-instead-of-a-col.patch
    Added Explicitely-transform-results-to-a-list.patch
---
 debian/changelog                                   | 10 +++++++--
 ...-to-return-an-rgba-tuple-instead-of-a-col.patch | 25 ++++++++++++++++++++++
 .../Explicitely-transform-results-to-a-list.patch  | 25 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c45c7de..18861ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-seaborn (0.7.1-2) UNRELEASED; urgency=medium
+seaborn (0.7.1-2) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload.
   * Move to Debian Science maintenance
   * Add python-bs4 to Recommends since its usage in test suite makes the
     installation recommended
 
- -- Andreas Tille <tille at debian.org>  Fri, 20 Jan 2017 15:55:11 +0100
+  [ Ole Streicher ]
+  * Loose too tight test. Closes: #850999, #849368
+  * Allow matplotlib to return an rgba tuple instead of a color name in
+    test. Closes: #849368
+
+ -- Ole Streicher <olebole at debian.org>  Mon, 23 Jan 2017 12:24:19 +0100
 
 seaborn (0.7.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/Allow-matplotlib-to-return-an-rgba-tuple-instead-of-a-col.patch b/debian/patches/Allow-matplotlib-to-return-an-rgba-tuple-instead-of-a-col.patch
new file mode 100644
index 0000000..7db3f0e
--- /dev/null
+++ b/debian/patches/Allow-matplotlib-to-return-an-rgba-tuple-instead-of-a-col.patch
@@ -0,0 +1,25 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Mon, 23 Jan 2017 12:19:52 +0100
+Subject: Allow matplotlib to return an rgba tuple instead of a color name in
+ test.
+
+This is required to have the test succeeding on matplotlib 2.0.
+
+Closes: #849368
+---
+ seaborn/tests/test_axisgrid.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/seaborn/tests/test_axisgrid.py b/seaborn/tests/test_axisgrid.py
+index 3f1dc5d..e93d275 100644
+--- a/seaborn/tests/test_axisgrid.py
++++ b/seaborn/tests/test_axisgrid.py
+@@ -269,7 +269,7 @@ class TestFacetGrid(PlotTestCase):
+ 
+         g = ag.FacetGrid(self.df, subplot_kws=dict(axisbg="blue"))
+         for ax in g.axes.flat:
+-            nt.assert_equal(ax.get_axis_bgcolor(), "blue")
++            nt.assert_in(ax.get_axis_bgcolor(), ("blue", (0.0, 0.0, 1.0, 1.0)))
+ 
+     @skipif(old_matplotlib)
+     def test_gridspec_kws(self):
diff --git a/debian/patches/Explicitely-transform-results-to-a-list.patch b/debian/patches/Explicitely-transform-results-to-a-list.patch
new file mode 100644
index 0000000..18ce017
--- /dev/null
+++ b/debian/patches/Explicitely-transform-results-to-a-list.patch
@@ -0,0 +1,25 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Mon, 23 Jan 2017 13:14:04 +0100
+Subject: Explicitely transform results to a list.
+
+Matplotlib now returns a _ColorPalette instead of a list, but slicing it
+will return a list. This let the equality check fail.
+
+Closes: #849368, #850999
+---
+ seaborn/tests/test_palettes.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/seaborn/tests/test_palettes.py b/seaborn/tests/test_palettes.py
+index 87c5ed4..f0ef385 100644
+--- a/seaborn/tests/test_palettes.py
++++ b/seaborn/tests/test_palettes.py
+@@ -163,7 +163,7 @@ class TestColorPalettes(object):
+ 
+         pal_forward = palettes.mpl_palette("BuPu", 6)
+         pal_reverse = palettes.mpl_palette("BuPu_r", 6)
+-        nt.assert_equal(pal_forward, pal_reverse[::-1])
++        np.testing.assert_allclose(pal_forward, pal_reverse[::-1])
+ 
+     def test_rgb_from_hls(self):
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c5eda7d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Allow-matplotlib-to-return-an-rgba-tuple-instead-of-a-col.patch
+Explicitely-transform-results-to-a-list.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/seaborn.git