CI: Unpin matplotlib (pandas-dev#51990)

phofl · Apr 23, 2023 · 2c68dd3 · 2c68dd3
1 parent 4539f3e
commit 2c68dd3
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 28 deletions.
diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml
@@ -32,7 +32,7 @@ dependencies:
   - gcsfs>=2022.05.0
   - jinja2>=3.1.2
   - lxml>=4.8.0
-  - matplotlib>=3.6.1, <3.7.0
+  - matplotlib>=3.6.1
   - numba>=0.55.2
   - numexpr>=2.8.0
   - odfpy>=1.4.1

diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml
@@ -32,7 +32,7 @@ dependencies:
   - gcsfs>=2022.05.0
   - jinja2>=3.1.2
   - lxml>=4.8.0
-  - matplotlib>=3.6.1, <3.7.0
+  - matplotlib>=3.6.1
   # - numba>=0.55.2 not compatible with 3.11
   - numexpr>=2.8.0
   - odfpy>=1.4.1

diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml
@@ -33,7 +33,7 @@ dependencies:
   - gcsfs>=2022.05.0
   - jinja2>=3.1.2
   - lxml>=4.8.0
-  - matplotlib>=3.6.1, <3.7.0
+  - matplotlib>=3.6.1
   - numba>=0.55.2
   - numexpr>=2.8.0
   - odfpy>=1.4.1

diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml
@@ -32,7 +32,7 @@ dependencies:
   - gcsfs>=2022.05.0
   - jinja2>=3.1.2
   - lxml>=4.8.0
-  - matplotlib>=3.6.1, <3.7.0
+  - matplotlib>=3.6.1
   - numba>=0.55.2
   - numexpr>=2.8.0
   - odfpy>=1.4.1

diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml
@@ -32,7 +32,7 @@ dependencies:
   - gcsfs>=2022.05.0
   - jinja2>=3.1.2
   - lxml>=4.8.0
-  - matplotlib>=3.6.1, <3.7.0
+  - matplotlib>=3.6.1
   - numba>=0.55.2
   - numexpr>=2.8.0
   - odfpy>=1.4.1

diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml
@@ -32,7 +32,7 @@ dependencies:
   - gcsfs>=2022.05.0
   - jinja2>=3.1.2
   - lxml>=4.8.0
-  - matplotlib>=3.6.1, <3.7.0
+  - matplotlib>=3.6.1
   - numba>=0.55.2
   - numexpr>=2.8.0
   - odfpy>=1.4.1

diff --git a/environment.yml b/environment.yml
@@ -35,7 +35,7 @@ dependencies:
   - ipython
   - jinja2>=3.1.2
   - lxml>=4.8.0
-  - matplotlib>=3.6.1, <3.7.0
+  - matplotlib>=3.6.1
   - numba>=0.55.2
   - numexpr>=2.8.0  # pin for "Run checks on imported code" job
   - openpyxl<3.1.1, >=3.0.7

diff --git a/pandas/plotting/_core.py b/pandas/plotting/_core.py
@@ -393,7 +393,7 @@ def hist_frame(
 
     >>> boxplot = df.boxplot(column=['Col1', 'Col2'], return_type='axes')
     >>> type(boxplot)
-    <class 'matplotlib.axes._subplots.AxesSubplot'>
+    <class 'matplotlib.axes._axes.Axes'>
 
 When grouping with ``by``, a Series mapping columns to ``return_type``
 is returned:

diff --git a/pandas/plotting/_misc.py b/pandas/plotting/_misc.py
@@ -143,22 +143,15 @@ def scatter_matrix(
 
         >>> df = pd.DataFrame(np.random.randn(1000, 4), columns=['A','B','C','D'])
         >>> pd.plotting.scatter_matrix(df, alpha=0.2)
-        array([[<AxesSubplot: xlabel='A', ylabel='A'>,
-            <AxesSubplot: xlabel='B', ylabel='A'>,
-            <AxesSubplot: xlabel='C', ylabel='A'>,
-            <AxesSubplot: xlabel='D', ylabel='A'>],
-           [<AxesSubplot: xlabel='A', ylabel='B'>,
-            <AxesSubplot: xlabel='B', ylabel='B'>,
-            <AxesSubplot: xlabel='C', ylabel='B'>,
-            <AxesSubplot: xlabel='D', ylabel='B'>],
-           [<AxesSubplot: xlabel='A', ylabel='C'>,
-            <AxesSubplot: xlabel='B', ylabel='C'>,
-            <AxesSubplot: xlabel='C', ylabel='C'>,
-            <AxesSubplot: xlabel='D', ylabel='C'>],
-           [<AxesSubplot: xlabel='A', ylabel='D'>,
-            <AxesSubplot: xlabel='B', ylabel='D'>,
-            <AxesSubplot: xlabel='C', ylabel='D'>,
-            <AxesSubplot: xlabel='D', ylabel='D'>]], dtype=object)
+        array([[<Axes: xlabel='A', ylabel='A'>, <Axes: xlabel='B', ylabel='A'>,
+                <Axes: xlabel='C', ylabel='A'>, <Axes: xlabel='D', ylabel='A'>],
+               [<Axes: xlabel='A', ylabel='B'>, <Axes: xlabel='B', ylabel='B'>,
+                <Axes: xlabel='C', ylabel='B'>, <Axes: xlabel='D', ylabel='B'>],
+               [<Axes: xlabel='A', ylabel='C'>, <Axes: xlabel='B', ylabel='C'>,
+                <Axes: xlabel='C', ylabel='C'>, <Axes: xlabel='D', ylabel='C'>],
+               [<Axes: xlabel='A', ylabel='D'>, <Axes: xlabel='B', ylabel='D'>,
+                <Axes: xlabel='C', ylabel='D'>, <Axes: xlabel='D', ylabel='D'>]],
+              dtype=object)
     """
     plot_backend = _get_plot_backend("matplotlib")
     return plot_backend.scatter_matrix(
@@ -509,7 +502,7 @@ def lag_plot(series: Series, lag: int = 1, ax: Axes | None = None, **kwds) -> Ax
         :context: close-figs
 
         >>> pd.plotting.lag_plot(s, lag=1)
-        <AxesSubplot: xlabel='y(t)', ylabel='y(t + 1)'>
+        <Axes: xlabel='y(t)', ylabel='y(t + 1)'>
     """
     plot_backend = _get_plot_backend("matplotlib")
     return plot_backend.lag_plot(series=series, lag=lag, ax=ax, **kwds)

diff --git a/pandas/tests/plotting/test_series.py b/pandas/tests/plotting/test_series.py
@@ -456,8 +456,8 @@ def test_df_series_secondary_legend(self):
     )
     def test_secondary_logy(self, input_logy, expected_scale):
         # GH 25545
-        s1 = Series(np.random.randn(30))
-        s2 = Series(np.random.randn(30))
+        s1 = Series(np.random.randn(100))
+        s2 = Series(np.random.randn(100))
 
         # GH 24980
         ax1 = s1.plot(logy=input_logy)

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -24,7 +24,7 @@ gcsfs>=2022.05.0
 ipython
 jinja2>=3.1.2
 lxml>=4.8.0
-matplotlib>=3.6.1, <3.7.0
+matplotlib>=3.6.1
 numba>=0.55.2
 numexpr>=2.8.0
 openpyxl<3.1.1, >=3.0.7