compat: Matplotlib 3.11.0 (#6856)

Author: hoxbro

holoviews/plotting/mpl/element.py

@@ -30,7 +30,7 @@
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import color_intervals, dim_range_key, process_cmap
 from .plot import MPLPlot, mpl_rc_context
-from .util import MPL_VERSION, EqHistNormalize, validate, wrap_formatter
+from .util import MPL_GE_3_11_0, MPL_VERSION, EqHistNormalize, validate, wrap_formatter
 
 
 class ElementPlot(GenericElementPlot, MPLPlot):
@@ -587,7 +587,7 @@ def _set_axis_ticks(self, axis, ticks, log=False, rotation=0):
         elif isinstance(ticks, (list, tuple)):
             labels = None
             if all(isinstance(t, tuple) for t in ticks):
-                ticks, labels = zip(*ticks, strict=None)
+                ticks, labels = zip(*ticks, strict=True)
             axis.set_ticks(ticks)
             if labels:
                 axis.set_ticklabels(labels)
@@ -1211,13 +1211,25 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=""):
                     )
             cmap = mpl_colors.ListedColormap(palette)
 
-        cmap = copy.copy(cmap)
-        if "max" in colors:
-            cmap.set_over(**colors["max"])
-        if "min" in colors:
-            cmap.set_under(**colors["min"])
-        if "NaN" in colors:
-            cmap.set_bad(**colors["NaN"])
+        if MPL_GE_3_11_0:
+
+            def _dict_to_rgba(name):
+                dct = colors.get(name)
+                if dct is None:
+                    return None
+                return mpl_colors.to_rgba(dct["color"], alpha=dct.get("alpha"))
+
+            cmap = cmap.with_extremes(
+                over=_dict_to_rgba("max"), under=_dict_to_rgba("min"), bad=_dict_to_rgba("NaN")
+            )
+        else:
+            cmap = copy.copy(cmap)
+            if "max" in colors:
+                cmap.set_over(**colors["max"])
+            if "min" in colors:
+                cmap.set_under(**colors["min"])
+            if "NaN" in colors:
+                cmap.set_bad(**colors["NaN"])
         opts[prefix + "cmap"] = cmap
 
 

holoviews/plotting/mpl/plot.py

@@ -37,7 +37,7 @@
     GenericLayoutPlot,
 )
 from ..util import attach_streams, collate, displayable
-from .util import compute_ratios, fix_aspect, get_old_rcparams
+from .util import MPL_GE_3_11_0, compute_ratios, fix_aspect, get_old_rcparams
 
 
 @contextmanager
@@ -1048,6 +1048,10 @@ def _compute_gridspec(self, layout):
         # Explicitly clear Matplotlib figures to avoid
         # "Auto-removal of overlapping axes" warning.
         self.handles["fig"].clf()
+        if MPL_GE_3_11_0:
+            # https://github.com/matplotlib/matplotlib/pull/27183
+            l, b, r, t = self.fig_bounds
+            self.handles["fig"].subplots_adjust(left=l, bottom=b, right=r, top=t)
 
         # Situate all the Layouts in the grid and compute the gridspec
         # indices for all the axes required by each LayoutPlot.

holoviews/plotting/mpl/util.py

@@ -45,6 +45,7 @@
 MPL_GE_3_9_0 = MPL_VERSION >= (3, 9, 0)
 MPL_GE_3_10_0 = MPL_VERSION >= (3, 10, 0)
 MPL_GE_3_10_1 = MPL_VERSION >= (3, 10, 1)
+MPL_GE_3_11_0 = MPL_VERSION >= (3, 11, 0)
 
 
 def is_color(color):

holoviews/tests/plotting/matplotlib/test_renderer.py

@@ -62,15 +62,17 @@ def test_get_size_row_plot(self):
         with style.context("default"):
             plot = self.renderer.get_plot(self.image1 + self.image2)
         w, h = self.renderer.get_size(plot)
+        assert w == 576
         # Depending on the backend the height may be slightly different
-        assert (w, h) == (576, 257) or (w, h) == (576, 259)
+        assert h in (257, 258, 259)
 
     def test_get_size_column_plot(self):
         with style.context("default"):
             plot = self.renderer.get_plot((self.image1 + self.image2).cols(1))
         w, h = self.renderer.get_size(plot)
+        assert w == 288
         # Depending on the backend the height may be slightly different
-        assert (w, h) == (288, 509) or (w, h) == (288, 511)
+        assert h in (509, 510, 511)
 
     def test_get_size_grid_plot(self):
         grid = hv.GridSpace({(i, j): self.image1 for i in range(3) for j in range(3)})