diff --git a/doc/api/next_api_changes/removals/00001-ABC.rst b/doc/api/next_api_changes/removals/00001-ABC.rst index 3cc5b6344f7f..390437d2a0dc 100644 --- a/doc/api/next_api_changes/removals/00001-ABC.rst +++ b/doc/api/next_api_changes/removals/00001-ABC.rst @@ -1,7 +1,5 @@ -Removal change template -~~~~~~~~~~~~~~~~~~~~~~~ +_api.warn_deprecated is updated +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Enter description of methods/classes removed here.... - -Please rename file with PR number and your initials i.e. "99999-ABC.rst" -and ``git add`` the new file. +... In the ``lib/matplotlib/tri/`` directory. +All files with _api.warn_deprecated is replaced with ValueError. diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py index c48b09b280ff..0b7dedee10bb 100644 --- a/lib/matplotlib/tri/triangulation.py +++ b/lib/matplotlib/tri/triangulation.py @@ -1,9 +1,6 @@ from ._triangulation import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py index 37406451d376..611f0cbbcd05 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -1,9 +1,6 @@ from ._tricontour import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file diff --git a/lib/matplotlib/tri/trifinder.py b/lib/matplotlib/tri/trifinder.py index 1aff5c9d3280..e4cf945eec92 100644 --- a/lib/matplotlib/tri/trifinder.py +++ b/lib/matplotlib/tri/trifinder.py @@ -1,9 +1,6 @@ from ._trifinder import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file diff --git a/lib/matplotlib/tri/triinterpolate.py b/lib/matplotlib/tri/triinterpolate.py index 3112bd38e6c6..e8e12a024c7f 100644 --- a/lib/matplotlib/tri/triinterpolate.py +++ b/lib/matplotlib/tri/triinterpolate.py @@ -1,9 +1,6 @@ from ._triinterpolate import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file diff --git a/lib/matplotlib/tri/tripcolor.py b/lib/matplotlib/tri/tripcolor.py index 0da87891810d..bb443dbd6faa 100644 --- a/lib/matplotlib/tri/tripcolor.py +++ b/lib/matplotlib/tri/tripcolor.py @@ -1,9 +1,6 @@ from ._tripcolor import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py index 7c012b1a59e7..493a865069ed 100644 --- a/lib/matplotlib/tri/triplot.py +++ b/lib/matplotlib/tri/triplot.py @@ -1,9 +1,6 @@ from ._triplot import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file diff --git a/lib/matplotlib/tri/trirefine.py b/lib/matplotlib/tri/trirefine.py index 6f22f9e8d203..db3bf6aa5e64 100644 --- a/lib/matplotlib/tri/trirefine.py +++ b/lib/matplotlib/tri/trirefine.py @@ -1,9 +1,6 @@ from ._trirefine import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file diff --git a/lib/matplotlib/tri/tritools.py b/lib/matplotlib/tri/tritools.py index 9c6839ca2049..c49d7882bf53 100644 --- a/lib/matplotlib/tri/tritools.py +++ b/lib/matplotlib/tri/tritools.py @@ -1,9 +1,6 @@ from ._tritools import * # noqa: F401, F403 -from matplotlib import _api - -_api.warn_deprecated( - "3.7", - message=f"Importing {__name__} was deprecated in Matplotlib 3.7 and will " - f"be removed two minor releases later. All functionality is " - f"available via the top-level module matplotlib.tri") +raise ValueError(f"Importing {__name__} was deprecated in Matplotlib 3.7 and will + be removed two minor releases later. All functionality is + available via the top-level module matplotlib.tri") + \ No newline at end of file