From 2c68dd3d9c415f40b04c500936670470c4eabd6e Mon Sep 17 00:00:00 2001 From: Patrick Hoefler <61934744+phofl@users.noreply.github.com> Date: Sun, 23 Apr 2023 12:02:53 +0200 Subject: [PATCH] CI: Unpin matplotlib (#51990) --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 2 +- ci/deps/actions-38.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/circle-38-arm64.yaml | 2 +- environment.yml | 2 +- pandas/plotting/_core.py | 2 +- pandas/plotting/_misc.py | 27 +++++++++-------------- pandas/tests/plotting/test_series.py | 4 ++-- requirements-dev.txt | 2 +- 11 files changed, 21 insertions(+), 28 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index f159b71a1b48c..83b476363e9e3 100644 --- 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 index 6da92a28965a2..70a674417e01e 100644 --- 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 index dbfcc535fe3fb..670d7c37dc4d2 100644 --- 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 index 86877c5f1c263..df7d0277f3ba9 100644 --- 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 index bc89fa7bbb8b9..7b60eec7696cc 100644 --- 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 index 85c4b82d55387..5102b2ca55404 100644 --- 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 index abbf83fea2508..bde8c46bffd97 100644 --- 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 index 75af0c7bdae79..6ef33c3d58306 100644 --- 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) - + 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 index cbfdbc10ad71c..f8f9a584f0563 100644 --- 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([[, - , - , - ], - [, - , - , - ], - [, - , - , - ], - [, - , - , - ]], dtype=object) + array([[, , + , ], + [, , + , ], + [, , + , ], + [, , + , ]], + 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) - + """ 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 index c294e9c23882d..755a1811c1356 100644 --- 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 index 8a79f911265a3..30189c35fcbb5 100644 --- 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