From f4ea77563a0944a15cd95ed43f9d069224bcc806 Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Mon, 25 Sep 2023 16:11:04 +0530 Subject: [PATCH 1/2] deprecated api tri --- lib/matplotlib/tri/triangulation.py | 2 +- lib/matplotlib/tri/tricontour.py | 2 +- lib/matplotlib/tri/trifinder.py | 2 +- lib/matplotlib/tri/triinterpolate.py | 2 +- lib/matplotlib/tri/tripcolor.py | 2 +- lib/matplotlib/tri/triplot.py | 2 +- lib/matplotlib/tri/trirefine.py | 2 +- lib/matplotlib/tri/tritools.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py index c48b09b280ff..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/triangulation.py +++ b/lib/matplotlib/tri/triangulation.py @@ -1,4 +1,4 @@ -from ._triangulation import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py index 37406451d376..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -1,4 +1,4 @@ -from ._tricontour import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api diff --git a/lib/matplotlib/tri/trifinder.py b/lib/matplotlib/tri/trifinder.py index 1aff5c9d3280..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/trifinder.py +++ b/lib/matplotlib/tri/trifinder.py @@ -1,4 +1,4 @@ -from ._trifinder import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api diff --git a/lib/matplotlib/tri/triinterpolate.py b/lib/matplotlib/tri/triinterpolate.py index 3112bd38e6c6..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/triinterpolate.py +++ b/lib/matplotlib/tri/triinterpolate.py @@ -1,4 +1,4 @@ -from ._triinterpolate import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api diff --git a/lib/matplotlib/tri/tripcolor.py b/lib/matplotlib/tri/tripcolor.py index 0da87891810d..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/tripcolor.py +++ b/lib/matplotlib/tri/tripcolor.py @@ -1,4 +1,4 @@ -from ._tripcolor import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py index 7c012b1a59e7..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/triplot.py +++ b/lib/matplotlib/tri/triplot.py @@ -1,4 +1,4 @@ -from ._triplot import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api diff --git a/lib/matplotlib/tri/trirefine.py b/lib/matplotlib/tri/trirefine.py index 6f22f9e8d203..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/trirefine.py +++ b/lib/matplotlib/tri/trirefine.py @@ -1,4 +1,4 @@ -from ._trirefine import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api diff --git a/lib/matplotlib/tri/tritools.py b/lib/matplotlib/tri/tritools.py index 9c6839ca2049..7d47c2b0a058 100644 --- a/lib/matplotlib/tri/tritools.py +++ b/lib/matplotlib/tri/tritools.py @@ -1,4 +1,4 @@ -from ._tritools import * # noqa: F401, F403 +from matplotlib.tri import * # noqa: F401, F403 from matplotlib import _api From 75dbcc0cc5f6f9da7998b628cd7cd3713c3ddd4c Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Tue, 26 Sep 2023 13:28:18 +0530 Subject: [PATCH 2/2] updated deprecated api --- doc/api/next_api_changes/removals/00001-ABC.rst | 7 +++---- lib/matplotlib/tri/triangulation.py | 12 ++++-------- lib/matplotlib/tri/tricontour.py | 12 ++++-------- lib/matplotlib/tri/trifinder.py | 12 ++++-------- lib/matplotlib/tri/triinterpolate.py | 12 ++++-------- lib/matplotlib/tri/tripcolor.py | 12 ++++-------- lib/matplotlib/tri/triplot.py | 12 ++++-------- lib/matplotlib/tri/trirefine.py | 12 ++++-------- lib/matplotlib/tri/tritools.py | 12 ++++-------- 9 files changed, 35 insertions(+), 68 deletions(-) diff --git a/doc/api/next_api_changes/removals/00001-ABC.rst b/doc/api/next_api_changes/removals/00001-ABC.rst index 3cc5b6344f7f..64fbf17dbe6f 100644 --- a/doc/api/next_api_changes/removals/00001-ABC.rst +++ b/doc/api/next_api_changes/removals/00001-ABC.rst @@ -1,7 +1,6 @@ -Removal change template +_api.warn_deprecated is updated ~~~~~~~~~~~~~~~~~~~~~~~ -Enter description of methods/classes removed here.... +... In the ``lib/matplotlib/tri/`` directory. -Please rename file with PR number and your initials i.e. "99999-ABC.rst" -and ``git add`` the new file. +All files with _api.warn_deprecated is replaced with ValueError. \ No newline at end of file diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py index 7d47c2b0a058..06a4dd96c27f 100644 --- a/lib/matplotlib/tri/triangulation.py +++ b/lib/matplotlib/tri/triangulation.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._triangulation import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"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 7d47c2b0a058..efaa10e7e44b 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._tricontour import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"available via the top-level module matplotlib.tri") diff --git a/lib/matplotlib/tri/trifinder.py b/lib/matplotlib/tri/trifinder.py index 7d47c2b0a058..8c0ef1d7d3b4 100644 --- a/lib/matplotlib/tri/trifinder.py +++ b/lib/matplotlib/tri/trifinder.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._trifinder import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"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 7d47c2b0a058..6ab427d4c6cc 100644 --- a/lib/matplotlib/tri/triinterpolate.py +++ b/lib/matplotlib/tri/triinterpolate.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._triinterpolate import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"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 7d47c2b0a058..a29c818ef0ae 100644 --- a/lib/matplotlib/tri/tripcolor.py +++ b/lib/matplotlib/tri/tripcolor.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._tripcolor import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"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 7d47c2b0a058..4dd29753009d 100644 --- a/lib/matplotlib/tri/triplot.py +++ b/lib/matplotlib/tri/triplot.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._triplot import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"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 7d47c2b0a058..eebaa440c5e7 100644 --- a/lib/matplotlib/tri/trirefine.py +++ b/lib/matplotlib/tri/trirefine.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._trirefine import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"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 7d47c2b0a058..c5357e87ed45 100644 --- a/lib/matplotlib/tri/tritools.py +++ b/lib/matplotlib/tri/tritools.py @@ -1,9 +1,5 @@ -from matplotlib.tri import * # noqa: F401, F403 -from matplotlib import _api +from ._tritools import * # noqa: F401, F403 - -_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 " + f"be removed two minor releases later. All functionality is " + f"available via the top-level module matplotlib.tri") \ No newline at end of file