Merge pull request #31588 from QuLogic/expire39 · matplotlib/matplotlib@fee65f1 · GitHub
Skip to content

Commit fee65f1

Browse files
authored
Merge pull request #31588 from QuLogic/expire39
Expire some missed deprecations from 3.9
2 parents 7814ada + de9e184 commit fee65f1

5 files changed

Lines changed: 24 additions & 30 deletions

File tree

Lines changed: 18 additions & 0 deletions

lib/matplotlib/axes/_axes.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4367,7 +4367,6 @@ def apply_mask(arrays, mask):
43674367

43684368
@_api.make_keyword_only("3.10", "notch")
43694369
@_preprocess_data()
4370-
@_api.rename_parameter("3.9", "labels", "tick_labels")
43714370
def boxplot(self, x, notch=None, sym=None, vert=None,
43724371
orientation='vertical', whis=None, positions=None,
43734372
widths=None, patch_artist=None, bootstrap=None,
@@ -4509,8 +4508,7 @@ def boxplot(self, x, notch=None, sym=None, vert=None,
45094508
values.
45104509
45114510
.. versionchanged:: 3.9
4512-
Renamed from *labels*, which is deprecated since 3.9
4513-
and will be removed in 3.11.
4511+
Renamed from *labels*, which is also removed in 3.11.
45144512
45154513
manage_ticks : bool, default: True
45164514
If True, the tick locations and labels will be adjusted to match

lib/matplotlib/backend_bases.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3516,20 +3516,6 @@ def _get_image_filename(self, tool):
35163516
for filename in [filename, filename + self._icon_extension]:
35173517
if os.path.isfile(filename):
35183518
return os.path.abspath(filename)
3519-
for fname in [ # Fallback; once deprecation elapses.
3520-
tool.image,
3521-
tool.image + self._icon_extension,
3522-
cbook._get_data_path("images", tool.image),
3523-
cbook._get_data_path("images", tool.image + self._icon_extension),
3524-
]:
3525-
if os.path.isfile(fname):
3526-
_api.warn_deprecated(
3527-
"3.9", message=f"Loading icon {tool.image!r} from the current "
3528-
"directory or from Matplotlib's image directory. This behavior "
3529-
"is deprecated since %(since)s and will be removed in %(removal)s; "
3530-
"Tool.image should be set to a path relative to the Tool's source "
3531-
"file, or to an absolute path.")
3532-
return os.path.abspath(fname)
35333519

35343520
def trigger_tool(self, name):
35353521
"""

lib/matplotlib/hatch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def _validate_hatch_pattern(hatch):
206206
invalids = ''.join(sorted(invalids))
207207
_api.warn_deprecated(
208208
'3.4',
209-
removal='3.11', # one release after custom hatches (#20690)
209+
removal='3.13', # one release after custom hatches (#20690)
210210
message=f'hatch must consist of a string of "{valid}" or '
211211
'None, but found the following invalid values '
212212
f'"{invalids}". Passing invalid values is deprecated '

lib/matplotlib/tests/test_axes.py

Lines changed: 4 additions & 12 deletions

0 commit comments

Comments
 (0)