Skip to content

Backport PR #29708 on branch v3.10.x (MNT: correct version in plotting method deprecation warnings) #29709

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.

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

Merged
Changes from all commits
Commits
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
44 changes: 22 additions & 22 deletions lib/matplotlib/axes/_axes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
self._request_autoscale_view("x")
return p

@_api.make_keyword_only("3.9", "label")
@_api.make_keyword_only("3.10", "label")
@_preprocess_data(replace_names=["y", "xmin", "xmax", "colors"],
label_namer="y")
def hlines(self, y, xmin, xmax, colors=None, linestyles='solid',
Expand Down Expand Up @@ -1187,7 +1187,7 @@ def hlines(self, y, xmin, xmax, colors=None, linestyles='solid',
self._request_autoscale_view()
return lines

@_api.make_keyword_only("3.9", "label")
@_api.make_keyword_only("3.10", "label")
@_preprocess_data(replace_names=["x", "ymin", "ymax", "colors"],
label_namer="x")
def vlines(self, x, ymin, ymax, colors=None, linestyles='solid',
Expand Down Expand Up @@ -1279,7 +1279,7 @@ def vlines(self, x, ymin, ymax, colors=None, linestyles='solid',
self._request_autoscale_view()
return lines

@_api.make_keyword_only("3.9", "orientation")
@_api.make_keyword_only("3.10", "orientation")
@_preprocess_data(replace_names=["positions", "lineoffsets",
"linelengths", "linewidths",
"colors", "linestyles"])
Expand Down Expand Up @@ -2086,7 +2086,7 @@ def acorr(self, x, **kwargs):
"""
return self.xcorr(x, x, **kwargs)

@_api.make_keyword_only("3.9", "normed")
@_api.make_keyword_only("3.10", "normed")
@_preprocess_data(replace_names=["x", "y"], label_namer="y")
def xcorr(self, x, y, normed=True, detrend=mlab.detrend_none,
usevlines=True, maxlags=10, **kwargs):
Expand Down Expand Up @@ -3229,7 +3229,7 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
self.add_container(stem_container)
return stem_container

@_api.make_keyword_only("3.9", "explode")
@_api.make_keyword_only("3.10", "explode")
@_preprocess_data(replace_names=["x", "explode", "labels", "colors"])
def pie(self, x, explode=None, labels=None, colors=None,
autopct=None, pctdistance=0.6, shadow=False, labeldistance=1.1,
Expand Down Expand Up @@ -3509,7 +3509,7 @@ def _errorevery_to_mask(x, errorevery):
everymask[errorevery] = True
return everymask

@_api.make_keyword_only("3.9", "ecolor")
@_api.make_keyword_only("3.10", "ecolor")
@_preprocess_data(replace_names=["x", "y", "xerr", "yerr"],
label_namer="y")
@_docstring.interpd
Expand Down Expand Up @@ -3887,7 +3887,7 @@ def apply_mask(arrays, mask):

return errorbar_container # (l0, caplines, barcols)

@_api.make_keyword_only("3.9", "notch")
@_api.make_keyword_only("3.10", "notch")
@_preprocess_data()
@_api.rename_parameter("3.9", "labels", "tick_labels")
def boxplot(self, x, notch=None, sym=None, vert=None,
Expand Down Expand Up @@ -4236,7 +4236,7 @@ def boxplot(self, x, notch=None, sym=None, vert=None,
orientation=orientation)
return artists

@_api.make_keyword_only("3.9", "widths")
@_api.make_keyword_only("3.10", "widths")
def bxp(self, bxpstats, positions=None, widths=None, vert=None,
orientation='vertical', patch_artist=False, shownotches=False,
showmeans=False, showcaps=True, showbox=True, showfliers=True,
Expand Down Expand Up @@ -4773,7 +4773,7 @@ def invalid_shape_exception(csize, xsize):
colors = None # use cmap, norm after collection is created
return c, colors, edgecolors

@_api.make_keyword_only("3.9", "marker")
@_api.make_keyword_only("3.10", "marker")
@_preprocess_data(replace_names=["x", "y", "s", "linewidths",
"edgecolors", "c", "facecolor",
"facecolors", "color"],
Expand Down Expand Up @@ -5064,7 +5064,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,

return collection

@_api.make_keyword_only("3.9", "gridsize")
@_api.make_keyword_only("3.10", "gridsize")
@_preprocess_data(replace_names=["x", "y", "C"], label_namer="y")
@_docstring.interpd
def hexbin(self, x, y, C=None, gridsize=100, bins=None,
Expand Down Expand Up @@ -6814,7 +6814,7 @@ def clabel(self, CS, levels=None, **kwargs):

#### Data analysis

@_api.make_keyword_only("3.9", "range")
@_api.make_keyword_only("3.10", "range")
@_preprocess_data(replace_names=["x", 'weights'], label_namer="x")
def hist(self, x, bins=None, range=None, density=False, weights=None,
cumulative=False, bottom=None, histtype='bar', align='mid',
Expand Down Expand Up @@ -7405,7 +7405,7 @@ def stairs(self, values, edges=None, *,
self._request_autoscale_view()
return patch

@_api.make_keyword_only("3.9", "range")
@_api.make_keyword_only("3.10", "range")
@_preprocess_data(replace_names=["x", "y", "weights"])
@_docstring.interpd
def hist2d(self, x, y, bins=10, range=None, density=False, weights=None,
Expand Down Expand Up @@ -7617,7 +7617,7 @@ def ecdf(self, x, weights=None, *, complementary=False,
line.sticky_edges.x[:] = [0, 1]
return line

@_api.make_keyword_only("3.9", "NFFT")
@_api.make_keyword_only("3.10", "NFFT")
@_preprocess_data(replace_names=["x"])
@_docstring.interpd
def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
Expand Down Expand Up @@ -7729,7 +7729,7 @@ def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
else:
return pxx, freqs, line

@_api.make_keyword_only("3.9", "NFFT")
@_api.make_keyword_only("3.10", "NFFT")
@_preprocess_data(replace_names=["x", "y"], label_namer="y")
@_docstring.interpd
def csd(self, x, y, NFFT=None, Fs=None, Fc=None, detrend=None,
Expand Down Expand Up @@ -7832,7 +7832,7 @@ def csd(self, x, y, NFFT=None, Fs=None, Fc=None, detrend=None,
else:
return pxy, freqs, line

@_api.make_keyword_only("3.9", "Fs")
@_api.make_keyword_only("3.10", "Fs")
@_preprocess_data(replace_names=["x"])
@_docstring.interpd
def magnitude_spectrum(self, x, Fs=None, Fc=None, window=None,
Expand Down Expand Up @@ -7919,7 +7919,7 @@ def magnitude_spectrum(self, x, Fs=None, Fc=None, window=None,

return spec, freqs, line

@_api.make_keyword_only("3.9", "Fs")
@_api.make_keyword_only("3.10", "Fs")
@_preprocess_data(replace_names=["x"])
@_docstring.interpd
def angle_spectrum(self, x, Fs=None, Fc=None, window=None,
Expand Down Expand Up @@ -7989,7 +7989,7 @@ def angle_spectrum(self, x, Fs=None, Fc=None, window=None,

return spec, freqs, lines[0]

@_api.make_keyword_only("3.9", "Fs")
@_api.make_keyword_only("3.10", "Fs")
@_preprocess_data(replace_names=["x"])
@_docstring.interpd
def phase_spectrum(self, x, Fs=None, Fc=None, window=None,
Expand Down Expand Up @@ -8059,7 +8059,7 @@ def phase_spectrum(self, x, Fs=None, Fc=None, window=None,

return spec, freqs, lines[0]

@_api.make_keyword_only("3.9", "NFFT")
@_api.make_keyword_only("3.10", "NFFT")
@_preprocess_data(replace_names=["x", "y"])
@_docstring.interpd
def cohere(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
Expand Down Expand Up @@ -8124,7 +8124,7 @@ def cohere(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,

return cxy, freqs

@_api.make_keyword_only("3.9", "NFFT")
@_api.make_keyword_only("3.10", "NFFT")
@_preprocess_data(replace_names=["x"])
@_docstring.interpd
def specgram(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
Expand Down Expand Up @@ -8286,7 +8286,7 @@ def specgram(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,

return spec, freqs, t, im

@_api.make_keyword_only("3.9", "precision")
@_api.make_keyword_only("3.10", "precision")
@_docstring.interpd
def spy(self, Z, precision=0, marker=None, markersize=None,
aspect='equal', origin="upper", **kwargs):
Expand Down Expand Up @@ -8477,7 +8477,7 @@ def matshow(self, Z, **kwargs):
mticker.MaxNLocator(nbins=9, steps=[1, 2, 5, 10], integer=True))
return im

@_api.make_keyword_only("3.9", "vert")
@_api.make_keyword_only("3.10", "vert")
@_preprocess_data(replace_names=["dataset"])
def violinplot(self, dataset, positions=None, vert=None,
orientation='vertical', widths=0.5, showmeans=False,
Expand Down Expand Up @@ -8603,7 +8603,7 @@ def _kde_method(X, coords):
showmeans=showmeans, showextrema=showextrema,
showmedians=showmedians, side=side)

@_api.make_keyword_only("3.9", "vert")
@_api.make_keyword_only("3.10", "vert")
def violin(self, vpstats, positions=None, vert=None,
orientation='vertical', widths=0.5, showmeans=False,
showextrema=True, showmedians=False, side='both'):
Expand Down
Loading