Skip to content

Commit 2c68dd3

Browse files
phoflphofl
authored
CI: Unpin matplotlib (#51990)
1 parent 4539f3e commit 2c68dd3

11 files changed

+21
-28
lines changed

‎ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs>=2022.05.0
3333
- jinja2>=3.1.2
3434
- lxml>=4.8.0
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba>=0.55.2
3737
- numexpr>=2.8.0
3838
- odfpy>=1.4.1

‎ci/deps/actions-311.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs>=2022.05.0
3333
- jinja2>=3.1.2
3434
- lxml>=4.8.0
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
# - numba>=0.55.2 not compatible with 3.11
3737
- numexpr>=2.8.0
3838
- odfpy>=1.4.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
- gcsfs>=2022.05.0
3434
- jinja2>=3.1.2
3535
- lxml>=4.8.0
36-
- matplotlib>=3.6.1, <3.7.0
36+
- matplotlib>=3.6.1
3737
- numba>=0.55.2
3838
- numexpr>=2.8.0
3939
- odfpy>=1.4.1

‎ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs>=2022.05.0
3333
- jinja2>=3.1.2
3434
- lxml>=4.8.0
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba>=0.55.2
3737
- numexpr>=2.8.0
3838
- odfpy>=1.4.1

‎ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs>=2022.05.0
3333
- jinja2>=3.1.2
3434
- lxml>=4.8.0
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba>=0.55.2
3737
- numexpr>=2.8.0
3838
- odfpy>=1.4.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- gcsfs>=2022.05.0
3333
- jinja2>=3.1.2
3434
- lxml>=4.8.0
35-
- matplotlib>=3.6.1, <3.7.0
35+
- matplotlib>=3.6.1
3636
- numba>=0.55.2
3737
- numexpr>=2.8.0
3838
- odfpy>=1.4.1

‎environment.yml

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

‎pandas/plotting/_core.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ def hist_frame(
393393
394394
>>> boxplot = df.boxplot(column=['Col1', 'Col2'], return_type='axes')
395395
>>> type(boxplot)
396-
<class 'matplotlib.axes._subplots.AxesSubplot'>
396+
<class 'matplotlib.axes._axes.Axes'>
397397
398398
When grouping with ``by``, a Series mapping columns to ``return_type``
399399
is returned:

‎pandas/plotting/_misc.py

+10-17
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,15 @@ def scatter_matrix(
143143
144144
>>> df = pd.DataFrame(np.random.randn(1000, 4), columns=['A','B','C','D'])
145145
>>> pd.plotting.scatter_matrix(df, alpha=0.2)
146-
array([[<AxesSubplot: xlabel='A', ylabel='A'>,
147-
<AxesSubplot: xlabel='B', ylabel='A'>,
148-
<AxesSubplot: xlabel='C', ylabel='A'>,
149-
<AxesSubplot: xlabel='D', ylabel='A'>],
150-
[<AxesSubplot: xlabel='A', ylabel='B'>,
151-
<AxesSubplot: xlabel='B', ylabel='B'>,
152-
<AxesSubplot: xlabel='C', ylabel='B'>,
153-
<AxesSubplot: xlabel='D', ylabel='B'>],
154-
[<AxesSubplot: xlabel='A', ylabel='C'>,
155-
<AxesSubplot: xlabel='B', ylabel='C'>,
156-
<AxesSubplot: xlabel='C', ylabel='C'>,
157-
<AxesSubplot: xlabel='D', ylabel='C'>],
158-
[<AxesSubplot: xlabel='A', ylabel='D'>,
159-
<AxesSubplot: xlabel='B', ylabel='D'>,
160-
<AxesSubplot: xlabel='C', ylabel='D'>,
161-
<AxesSubplot: xlabel='D', ylabel='D'>]], dtype=object)
146+
array([[<Axes: xlabel='A', ylabel='A'>, <Axes: xlabel='B', ylabel='A'>,
147+
<Axes: xlabel='C', ylabel='A'>, <Axes: xlabel='D', ylabel='A'>],
148+
[<Axes: xlabel='A', ylabel='B'>, <Axes: xlabel='B', ylabel='B'>,
149+
<Axes: xlabel='C', ylabel='B'>, <Axes: xlabel='D', ylabel='B'>],
150+
[<Axes: xlabel='A', ylabel='C'>, <Axes: xlabel='B', ylabel='C'>,
151+
<Axes: xlabel='C', ylabel='C'>, <Axes: xlabel='D', ylabel='C'>],
152+
[<Axes: xlabel='A', ylabel='D'>, <Axes: xlabel='B', ylabel='D'>,
153+
<Axes: xlabel='C', ylabel='D'>, <Axes: xlabel='D', ylabel='D'>]],
154+
dtype=object)
162155
"""
163156
plot_backend = _get_plot_backend("matplotlib")
164157
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

+2-2
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gcsfs>=2022.05.0
2424
ipython
2525
jinja2>=3.1.2
2626
lxml>=4.8.0
27-
matplotlib>=3.6.1, <3.7.0
27+
matplotlib>=3.6.1
2828
numba>=0.55.2
2929
numexpr>=2.8.0
3030
openpyxl<3.1.1, >=3.0.7

0 commit comments

Comments
 (0)