TST: matplotlib 3.11 compatibility

mapclassify/tests/conftest.py

@@ -4,9 +4,13 @@
 def pytest_configure(config):  # noqa: ARG001
     """PyTest session attributes, methods, etc."""
 
-    pytest.image_comp_kws = {"extensions": ["png"], "tol": 0.35, "remove_text": True}
+    pytest.image_comp_kws = {
+        "extensions": ["png"],
+        "remove_text": True,
+        "style": "mpl20",
+    }
     pytest.image_comp_kws_legend_text = {
         "extensions": ["png"],
-        "tol": 2.8,
         "remove_text": True,
+        "style": "mpl20",
     }

mapclassify/tests/test_legendgram.py

@@ -1,14 +1,22 @@
+import copy
+
 import geopandas as gpd
 import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 import pytest
 from libpysal import examples
 from matplotlib.testing.decorators import image_comparison
+from packaging.version import Version
 
 from mapclassify import EqualInterval, Quantiles
 from mapclassify.legendgram import _legendgram
 
+GPD_113_dev = Version(gpd.__version__).is_devrelease and Version(
+    Version(gpd.__version__).base_version
+) >= Version("1.1.2")
+
+
 no_data_warning = pytest.warns(
     UserWarning,
     match="There is no data associated with the `ax`",
@@ -122,7 +130,10 @@ def test_legendgram_position(self):
                 self.classifier, ax=ax, loc="upper right", legend_size=("40%", "30%")
             )
 
-    @image_comparison(["legendgram_map"], **pytest.image_comp_kws)
+    map_image_comp_kws = copy.deepcopy(pytest.image_comp_kws)
+    map_image_comp_kws["tol"] = 2.14
+
+    @image_comparison(["legendgram_map"], **map_image_comp_kws)
     def test_legendgram_map(self):
         """Test with geopandas map"""
         data = gpd.read_file(examples.get_path("south.shp")).to_crs(epsg=5070)
@@ -145,21 +156,27 @@ def test_legendgram_kwargs(self):
                 orientation="horizontal",
             )
 
+    @pytest.mark.skipif(GPD_113_dev, reason="Fixed in GeoPandas dev as of [2026/06]")
     @image_comparison(["legendgram_most_recent_cmap"], **pytest.image_comp_kws)
     def test_legendgram_most_recent_cmap(self):
         """Test most recent  colormap legendgram appearance"""
         data = gpd.read_file(examples.get_path("south.shp")).to_crs(epsg=5070)
         ax = data.plot("DV80", k=10, scheme="Quantiles", cmap="Blues")
         data.plot("DV80", ax=ax, k=10, scheme="Quantiles", cmap="Greens")
         classifier = Quantiles(data["DV80"].values, k=10)
+
         with pytest.warns(
             UserWarning,
             match=(
                 "There are 2 unique colormaps associated with the axes. "
                 "Defaulting to most recent colormap: 'Greens'"
             ),
         ):
-            classifier.plot_legendgram(
-                ax=ax, legend_size=("50%", "20%"), loc="upper left", clip=(2, 10)
-            )
+            kwargs = {
+                "ax": ax,
+                "legend_size": ("50%", "20%"),
+                "loc": "upper left",
+                "clip": (2, 10),
+            }
+            classifier.plot_legendgram(**kwargs)
         ax.set_axis_off()

mapclassify/tests/test_mapclassify.py

@@ -1,5 +1,6 @@
 import types
 
+import matplotlib
 import numpy
 import pandas
 import pytest
@@ -788,17 +789,23 @@ def setup_method(self):
 
     @image_comparison(["test_histogram_plot"], **pytest.image_comp_kws)
     def test_histogram_plot(self):
-        ax = Quantiles(self.data).plot_histogram()
+        fig, ax = matplotlib.pyplot.subplots(**{"figsize": (8, 6), "dpi": 100})
+        ax = Quantiles(self.data).plot_histogram(ax=ax)
+        ax.set(xlabel=None, ylabel=None)
         return ax.get_figure()
 
     @image_comparison(["test_histogram_plot_despine"], **pytest.image_comp_kws)
     def test_histogram_plot_despine(self):
-        ax = Quantiles(self.data).plot_histogram(despine=False)
+        fig, ax = matplotlib.pyplot.subplots(**{"figsize": (8, 6), "dpi": 100})
+        ax = Quantiles(self.data).plot_histogram(ax=ax, despine=False)
+        ax.set(xlabel=None, ylabel=None)
         return ax.get_figure()
 
     @image_comparison(["test_histogram_plot_linewidth"], **pytest.image_comp_kws)
     def test_histogram_plot_linewidth(self):
+        fig, ax = matplotlib.pyplot.subplots(**{"figsize": (8, 6), "dpi": 100})
         ax = Quantiles(self.data).plot_histogram(
-            linewidth=3, linecolor="red", color="yellow"
+            ax=ax, linewidth=3, linecolor="red", color="yellow"
         )
+        ax.set(xlabel=None, ylabel=None)
         return ax.get_figure()

mapclassify/tests/test_value_by_alpha.py

@@ -17,6 +17,7 @@ def setup_method(self):
     @image_comparison(["no_classify_default"], **pytest.image_comp_kws)
     def test_no_classify_default(self):
         fig, ax = vba_choropleth(self.x, self.y, self.gdf)
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -26,6 +27,7 @@ def test_pass_in_ax(self):
         fig = plt.figure()
         ax = fig.add_subplot(111)
         fig, ax = vba_choropleth(self.x, self.y, self.gdf, ax=ax)
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -40,6 +42,7 @@ def test_classify_xy_redblue(self):
             y_classification_kwds={"classifier": "quantiles"},
             cmap="RdBu",
         )
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -57,6 +60,7 @@ def test_divergent_revert_alpha_min_alpha(self):
             revert_alpha=True,
             min_alpha=0.5,
         )
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -65,6 +69,7 @@ def test_divergent_revert_alpha_min_alpha(self):
     def test_userdefined_colors(self):
         color_list = ["#a1dab4", "#41b6c4", "#225ea8"]
         fig, ax = vba_choropleth(self.x, self.y, self.gdf, cmap=color_list)
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -76,6 +81,7 @@ def test_shifted_colormap(self):
         assert mid08.name == "RdBu_08"
 
         fig, ax = vba_choropleth(self.x, self.y, self.gdf, cmap=mid08)
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -87,6 +93,7 @@ def test_truncated_colormap(self):
         assert trunc0206.name == "trunc(RdBu,0.20,0.60)"
 
         fig, ax = vba_choropleth(self.x, self.y, self.gdf, cmap=trunc0206)
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -111,6 +118,7 @@ def test_legend(self):
             y_classification_kwds={"classifier": "quantiles"},
             legend=True,
         )
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)
@@ -126,6 +134,7 @@ def test_legend_kwargs(self):
             legend=True,
             legend_kwargs={"x_label": self.x, "y_label": self.y},
         )
+        ax.set(xlabel=None, ylabel=None)
 
         assert isinstance(fig, matplotlib.figure.Figure)
         assert isinstance(ax, matplotlib.axes.Axes)