Skip to content

Commit a5904ad

Browse files
phoflphofl
committed
CI: Unpin matplotlib (pandas-dev#51990)
(cherry picked from commit 2c68dd3)
1 parent 3af68dc commit a5904ad

11 files changed

+21
-28
lines changed

‎ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs
3333
- jinja2
3434
- lxml
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba
3737
- numexpr
3838
- openpyxl<3.1.1

‎ci/deps/actions-311.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs
3333
- jinja2
3434
- lxml
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
# - numba not compatible with 3.11
3737
- numexpr
3838
- openpyxl<3.1.1

‎ci/deps/actions-38-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
- gcsfs
3434
- jinja2
3535
- lxml
36-
- matplotlib>=3.6.1, <3.7.0
36+
- matplotlib>=3.6.1
3737
- numba
3838
- numexpr
3939
- openpyxl<3.1.1

‎ci/deps/actions-38.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs
3333
- jinja2
3434
- lxml
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba
3737
- numexpr
3838
- openpyxl<3.1.1

‎ci/deps/actions-39.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs
3333
- jinja2
3434
- lxml
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba
3737
- numexpr
3838
- openpyxl<3.1.1

‎ci/deps/circle-38-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs
3333
- jinja2
3434
- lxml
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba
3737
- numexpr
3838
- openpyxl<3.1.1

‎environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies:
3535
- ipython
3636
- jinja2
3737
- lxml
38-
- matplotlib>=3.6.1, <3.7.0
38+
- matplotlib>=3.6.1
3939
- numba>=0.53.1
4040
- numexpr>=2.8.0 # pin for "Run checks on imported code" job
4141
- openpyxl<3.1.1

‎pandas/plotting/_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ def hist_frame(
387387
388388
>>> boxplot = df.boxplot(column=['Col1', 'Col2'], return_type='axes')
389389
>>> type(boxplot)
390-
<class 'matplotlib.axes._subplots.AxesSubplot'>
390+
<class 'matplotlib.axes._axes.Axes'>
391391
392392
When grouping with ``by``, a Series mapping columns to ``return_type``
393393
is returned:

‎pandas/plotting/_misc.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -139,22 +139,15 @@ def scatter_matrix(
139139
140140
>>> df = pd.DataFrame(np.random.randn(1000, 4), columns=['A','B','C','D'])
141141
>>> pd.plotting.scatter_matrix(df, alpha=0.2)
142-
array([[<AxesSubplot: xlabel='A', ylabel='A'>,
143-
<AxesSubplot: xlabel='B', ylabel='A'>,
144-
<AxesSubplot: xlabel='C', ylabel='A'>,
145-
<AxesSubplot: xlabel='D', ylabel='A'>],
146-
[<AxesSubplot: xlabel='A', ylabel='B'>,
147-
<AxesSubplot: xlabel='B', ylabel='B'>,
148-
<AxesSubplot: xlabel='C', ylabel='B'>,
149-
<AxesSubplot: xlabel='D', ylabel='B'>],
150-
[<AxesSubplot: xlabel='A', ylabel='C'>,
151-
<AxesSubplot: xlabel='B', ylabel='C'>,
152-
<AxesSubplot: xlabel='C', ylabel='C'>,
153-
<AxesSubplot: xlabel='D', ylabel='C'>],
154-
[<AxesSubplot: xlabel='A', ylabel='D'>,
155-
<AxesSubplot: xlabel='B', ylabel='D'>,
156-
<AxesSubplot: xlabel='C', ylabel='D'>,
157-
<AxesSubplot: xlabel='D', ylabel='D'>]], dtype=object)
142+
array([[<Axes: xlabel='A', ylabel='A'>, <Axes: xlabel='B', ylabel='A'>,
143+
<Axes: xlabel='C', ylabel='A'>, <Axes: xlabel='D', ylabel='A'>],
144+
[<Axes: xlabel='A', ylabel='B'>, <Axes: xlabel='B', ylabel='B'>,
145+
<Axes: xlabel='C', ylabel='B'>, <Axes: xlabel='D', ylabel='B'>],
146+
[<Axes: xlabel='A', ylabel='C'>, <Axes: xlabel='B', ylabel='C'>,
147+
<Axes: xlabel='C', ylabel='C'>, <Axes: xlabel='D', ylabel='C'>],
148+
[<Axes: xlabel='A', ylabel='D'>, <Axes: xlabel='B', ylabel='D'>,
149+
<Axes: xlabel='C', ylabel='D'>, <Axes: xlabel='D', ylabel='D'>]],
150+
dtype=object)
158151
"""
159152
plot_backend = _get_plot_backend("matplotlib")
160153
return plot_backend.scatter_matrix(
@@ -509,7 +502,7 @@ def lag_plot(series: Series, lag: int = 1, ax: Axes | None = None, **kwds) -> Ax
509502
:context: close-figs
510503
511504
>>> pd.plotting.lag_plot(s, lag=1)
512-
<AxesSubplot: xlabel='y(t)', ylabel='y(t + 1)'>
505+
<Axes: xlabel='y(t)', ylabel='y(t + 1)'>
513506
"""
514507
plot_backend = _get_plot_backend("matplotlib")
515508
return plot_backend.lag_plot(series=series, lag=lag, ax=ax, **kwds)

‎pandas/tests/plotting/test_series.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,8 @@ def test_df_series_secondary_legend(self):
456456
)
457457
def test_secondary_logy(self, input_logy, expected_scale):
458458
# GH 25545
459-
s1 = Series(np.random.randn(30))
460-
s2 = Series(np.random.randn(30))
459+
s1 = Series(np.random.randn(100))
460+
s2 = Series(np.random.randn(100))
461461

462462
# GH 24980
463463
ax1 = s1.plot(logy=input_logy)

‎requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gcsfs
2424
ipython
2525
jinja2
2626
lxml
27-
matplotlib>=3.6.1, <3.7.0
27+
matplotlib>=3.6.1
2828
numba>=0.53.1
2929
numexpr>=2.8.0
3030
openpyxl<3.1.1

0 commit comments

Comments
 (0)