From 396f435b69f309995255e0f0392ebd218476081b Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Wed, 15 Mar 2023 16:52:32 +0100 Subject: [PATCH 1/3] CI: Unpin matplotlib --- 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 +- requirements-dev.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index f40b555593f6b..2160a4ff3e30b 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -32,7 +32,7 @@ dependencies: - gcsfs>=2021.07.0 - jinja2>=3.0.0 - lxml>=4.6.3 - - matplotlib>=3.6.1, <3.7.0 + - matplotlib>=3.6.1 - numba>=0.53.1 - numexpr>=2.7.3 - openpyxl<3.1.1, >=3.0.7 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index fa08bdf438dff..be2e7479eee5e 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -32,7 +32,7 @@ dependencies: - gcsfs>=2021.07.0 - jinja2>=3.0.0 - lxml>=4.6.3 - - matplotlib>=3.6.1, <3.7.0 + - matplotlib>=3.6.1 # - numba not compatible with 3.11 - numexpr>=2.7.3 - openpyxl<3.1.1, >=3.0.7 diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index a9265bd84ee87..2401455c113c3 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -33,7 +33,7 @@ dependencies: - gcsfs>=2021.07.0 - jinja2>=3.0.0 - lxml>=4.6.3 - - matplotlib>=3.6.1, <3.7.0 + - matplotlib>=3.6.1 - numba>=0.53.1 - numexpr>=2.7.3 - openpyxl<3.1.1, >=3.0.7 diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 27872514447a5..f666a7c375744 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -32,7 +32,7 @@ dependencies: - gcsfs>=2021.07.0 - jinja2>=3.0.0 - lxml>=4.6.3 - - matplotlib>=3.6.1, <3.7.0 + - matplotlib>=3.6.1 - numba>=0.53.1 - numexpr>=2.7.3 - openpyxl<3.1.1, >=3.0.7 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 4b0575d8a3afd..3827f283ebfd5 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -32,7 +32,7 @@ dependencies: - gcsfs>=2021.07.0 - jinja2>=3.0.0 - lxml>=4.6.3 - - matplotlib>=3.6.1, <3.7.0 + - matplotlib>=3.6.1 - numba>=0.53.1 - numexpr>=2.7.3 - openpyxl<3.1.1, >=3.0.7 diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index c3d89e735ae37..ad2fe755dab85 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -32,7 +32,7 @@ dependencies: - gcsfs>=2021.07.0 - jinja2>=3.0.0 - lxml>=4.6.3 - - matplotlib>=3.6.1, <3.7.0 + - matplotlib>=3.6.1 - numba>=0.53.1 - numexpr>=2.7.3 - openpyxl<3.1.1, >=3.0.7 diff --git a/environment.yml b/environment.yml index f29ade1dc5173..1cad4c953adb7 100644 --- a/environment.yml +++ b/environment.yml @@ -35,7 +35,7 @@ dependencies: - ipython - jinja2>=3.0.0 - lxml>=4.6.3 - - matplotlib>=3.6.1, <3.7.0 + - matplotlib>=3.6.1 - numba>=0.53.1 - numexpr>=2.7.3 # pin for "Run checks on imported code" job - openpyxl<3.1.1, >=3.0.7 diff --git a/requirements-dev.txt b/requirements-dev.txt index 9c0bdc64d6e07..17b19fb018e59 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -24,7 +24,7 @@ gcsfs>=2021.07.0 ipython jinja2>=3.0.0 lxml>=4.6.3 -matplotlib>=3.6.1, <3.7.0 +matplotlib>=3.6.1 numba>=0.53.1 numexpr>=2.7.3 openpyxl<3.1.1, >=3.0.7 From 37f041f8ee04f1f491616fb3bd790d6012277251 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Sat, 22 Apr 2023 20:41:37 +0200 Subject: [PATCH 2/3] Fix doc errors --- pandas/plotting/_core.py | 2 +- pandas/plotting/_misc.py | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) 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) From f6547a2e6cf83402ef482a5ca59618152d40439f Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Sat, 22 Apr 2023 22:04:08 +0200 Subject: [PATCH 3/3] Increase size --- pandas/tests/plotting/test_series.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)