FIX: accomodate pandas type that doesn't return numpy from .values

jklymak · jklymak · commit 5052af52420a · 2022-01-07T10:22:24.000+01:00
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1339,7 +1339,8 @@ def _check_1d(x):
         # AssertionError for some Series objects, but should be
         # IndexError as described in
         # https://github.com/pandas-dev/pandas/issues/35527
-        except (AssertionError, IndexError, TypeError):
+        # ValueError: https://github.com/matplotlib/matplotlib/issues/22125
+        except (AssertionError, IndexError, TypeError, ValueError):
             return np.atleast_1d(x)
 
 
@@ -1649,7 +1650,7 @@ def index_of(y):
        The x and y values to plot.
     """
     try:
-        return y.index.values, y.values
+        return y.index.to_numpy(), y.to_numpy()
     except AttributeError:
         pass
     try:
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1749,11 +1749,12 @@ def test_bar_hatches(fig_test, fig_ref):
 
 def test_pandas_minimal_plot(pd):
     # smoke test that series and index objcets do not warn
-    x = pd.Series([1, 2], dtype="float64")
-    plt.plot(x, x)
-    plt.plot(x.index, x)
-    plt.plot(x)
-    plt.plot(x.index)
+    for x in [pd.Series([1, 2], dtype="float64"),
+              pd.Series([1, 2], dtype="Float32")]:
+        plt.plot(x, x)
+        plt.plot(x.index, x)
+        plt.plot(x)
+        plt.plot(x.index)
 
 
 @image_comparison(['hist_log'], remove_text=True)
