Fix broken color tests by manually backporting assert_colors_equal

seaborn/_testing.py

@@ -1,5 +1,6 @@
 import numpy as np
 import matplotlib as mpl
+from matplotlib.colors import to_rgb, to_rgba
 from numpy.testing import assert_array_equal
 
 
@@ -38,6 +39,24 @@
 ]
 
 
+def assert_colors_equal(a, b, check_alpha=True):
+
+    def handle_array(x):
+
+        if isinstance(x, np.ndarray):
+            if x.ndim > 1:
+                x = np.unique(x, axis=0).squeeze()
+            if x.ndim > 1:
+                raise ValueError("Color arrays must be 1 dimensional")
+        return x
+
+    a = handle_array(a)
+    b = handle_array(b)
+
+    f = to_rgba if check_alpha else to_rgb
+    assert f(a) == f(b)
+
+
 def assert_artists_equal(list1, list2, properties):
 
     assert len(list1) == len(list2)

seaborn/tests/test_axisgrid.py

@@ -20,6 +20,7 @@
 from .. import axisgrid as ag
 from .._testing import (
     assert_plots_equal,
+    assert_colors_equal,
 )
 
 rs = np.random.RandomState(0)
@@ -965,21 +966,20 @@ def test_map_diag_rectangular(self):
     def test_map_diag_color(self):
 
         color = "red"
-        rgb_color = mpl.colors.colorConverter.to_rgba(color)
 
         g1 = ag.PairGrid(self.df)
         g1.map_diag(plt.hist, color=color)
 
         for ax in g1.diag_axes:
             for patch in ax.patches:
-                assert patch.get_facecolor() == rgb_color
+                assert_colors_equal(patch.get_facecolor(), color)
 
         g2 = ag.PairGrid(self.df)
         g2.map_diag(kdeplot, color='red')
 
         for ax in g2.diag_axes:
             for line in ax.lines:
-                assert line.get_color() == color
+                assert_colors_equal(line.get_color(), color)
 
     def test_map_diag_palette(self):
 
@@ -990,7 +990,7 @@ def test_map_diag_palette(self):
 
         for ax in g.diag_axes:
             for line, color in zip(ax.lines[::-1], pal):
-                assert line.get_color() == color
+                assert_colors_equal(line.get_color(), color)
 
     def test_map_diag_and_offdiag(self):
 
@@ -1609,6 +1609,7 @@ def test_refline(self):
         npt.assert_array_equal(g.ax_joint.lines[-1].get_xydata(), hline)
         assert len(g.ax_marg_x.lines) == len(g.ax_marg_y.lines)
 
+
 class TestJointPlot:
 
     rs = np.random.RandomState(sum(map(ord, "jointplot")))

seaborn/tests/test_matrix.py

@@ -28,6 +28,9 @@
     _no_fastcluster = True
 
 
+# Copied from master onto v0.11 here to fix break introduced by
+# cherry pick commit 49fbd353
+
 class TestHeatmap:
     rs = np.random.RandomState(sum(map(ord, "heatmap")))