Skip to content

Backport PR #51990 on branch 2.0.x (CI: Unpin matplotlib) #52874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Backport PR #51990 on branch 2.0.x (CI: Unpin matplotlib) #52874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/deps/actions-310.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- gcsfs
- jinja2
- lxml
- matplotlib>=3.6.1, <3.7.0
- matplotlib>=3.6.1
- numba
- numexpr
- openpyxl<3.1.1
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-311.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- gcsfs
- jinja2
- lxml
- matplotlib>=3.6.1, <3.7.0
- matplotlib>=3.6.1
# - numba not compatible with 3.11
- numexpr
- openpyxl<3.1.1
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-38-downstream_compat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
- gcsfs
- jinja2
- lxml
- matplotlib>=3.6.1, <3.7.0
- matplotlib>=3.6.1
- numba
- numexpr
- openpyxl<3.1.1
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-38.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- gcsfs
- jinja2
- lxml
- matplotlib>=3.6.1, <3.7.0
- matplotlib>=3.6.1
- numba
- numexpr
- openpyxl<3.1.1
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-39.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- gcsfs
- jinja2
- lxml
- matplotlib>=3.6.1, <3.7.0
- matplotlib>=3.6.1
- numba
- numexpr
- openpyxl<3.1.1
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/circle-38-arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- gcsfs
- jinja2
- lxml
- matplotlib>=3.6.1, <3.7.0
- matplotlib>=3.6.1
- numba
- numexpr
- openpyxl<3.1.1
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies:
- ipython
- jinja2
- lxml
- matplotlib>=3.6.1, <3.7.0
- matplotlib>=3.6.1
- numba>=0.53.1
- numexpr>=2.8.0 # pin for "Run checks on imported code" job
- openpyxl<3.1.1
Expand Down
2 changes: 1 addition & 1 deletion pandas/plotting/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,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:
Expand Down
27 changes: 10 additions & 17 deletions pandas/plotting/_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,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(
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/plotting/test_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gcsfs
ipython
jinja2
lxml
matplotlib>=3.6.1, <3.7.0
matplotlib>=3.6.1
numba>=0.53.1
numexpr>=2.8.0
openpyxl<3.1.1
Expand Down