From f4ea77563a0944a15cd95ed43f9d069224bcc806 Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Mon, 25 Sep 2023 16:11:04 +0530 Subject: [PATCH 1/7] 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 02c6a297a3be27e1748f766c68eda9541063741a Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Tue, 26 Sep 2023 16:02:34 +0530 Subject: [PATCH 2/7] updated deprecated api tri --- doc/api/next_api_changes/removals/00001-ABC.rst | 7 ++----- lib/matplotlib/tri/triangulation.py | 9 --------- lib/matplotlib/tri/tricontour.py | 9 --------- lib/matplotlib/tri/trifinder.py | 9 --------- lib/matplotlib/tri/triinterpolate.py | 9 --------- lib/matplotlib/tri/tripcolor.py | 9 --------- lib/matplotlib/tri/triplot.py | 9 --------- lib/matplotlib/tri/trirefine.py | 9 --------- lib/matplotlib/tri/tritools.py | 9 --------- 9 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 lib/matplotlib/tri/triangulation.py delete mode 100644 lib/matplotlib/tri/tricontour.py delete mode 100644 lib/matplotlib/tri/trifinder.py delete mode 100644 lib/matplotlib/tri/triinterpolate.py delete mode 100644 lib/matplotlib/tri/tripcolor.py delete mode 100644 lib/matplotlib/tri/triplot.py delete mode 100644 lib/matplotlib/tri/trirefine.py delete mode 100644 lib/matplotlib/tri/tritools.py diff --git a/doc/api/next_api_changes/removals/00001-ABC.rst b/doc/api/next_api_changes/removals/00001-ABC.rst index 3cc5b6344f7f..4ba7e95fc8dd 100644 --- a/doc/api/next_api_changes/removals/00001-ABC.rst +++ b/doc/api/next_api_changes/removals/00001-ABC.rst @@ -1,7 +1,4 @@ -Removal change template +Deprecated Api Tri ~~~~~~~~~~~~~~~~~~~~~~~ -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. +Removed the files involving Deprecated Api. diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/triangulation.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/tricontour.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") diff --git a/lib/matplotlib/tri/trifinder.py b/lib/matplotlib/tri/trifinder.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/trifinder.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") diff --git a/lib/matplotlib/tri/triinterpolate.py b/lib/matplotlib/tri/triinterpolate.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/triinterpolate.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") diff --git a/lib/matplotlib/tri/tripcolor.py b/lib/matplotlib/tri/tripcolor.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/tripcolor.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/triplot.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") diff --git a/lib/matplotlib/tri/trirefine.py b/lib/matplotlib/tri/trirefine.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/trirefine.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") diff --git a/lib/matplotlib/tri/tritools.py b/lib/matplotlib/tri/tritools.py deleted file mode 100644 index 7d47c2b0a058..000000000000 --- a/lib/matplotlib/tri/tritools.py +++ /dev/null @@ -1,9 +0,0 @@ -from matplotlib.tri 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") From 93025a7e0ee685aa48e17599d0fadfd427f67ee4 Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Wed, 27 Sep 2023 12:17:05 +0530 Subject: [PATCH 3/7] updated deprecated api tri --- doc/api/next_api_changes/removals/26909-VV.rst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/api/next_api_changes/removals/26909-VV.rst diff --git a/doc/api/next_api_changes/removals/26909-VV.rst b/doc/api/next_api_changes/removals/26909-VV.rst new file mode 100644 index 000000000000..b3a4626b5c90 --- /dev/null +++ b/doc/api/next_api_changes/removals/26909-VV.rst @@ -0,0 +1,5 @@ + ``matplotlib.tri`` submodules are deprecated + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + The ``matplotlib.tri.*`` submodules are deprecated. All functionality is + available in ``matplotlib.tri`` directly and should be imported from there. \ No newline at end of file From 5b205a7115393022e7085ea556b70084e2787d99 Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Wed, 27 Sep 2023 12:19:08 +0530 Subject: [PATCH 4/7] updated deprecated api tri --- doc/api/next_api_changes/removals/00001-ABC.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/api/next_api_changes/removals/00001-ABC.rst b/doc/api/next_api_changes/removals/00001-ABC.rst index 4ba7e95fc8dd..8f6d55ac520c 100644 --- a/doc/api/next_api_changes/removals/00001-ABC.rst +++ b/doc/api/next_api_changes/removals/00001-ABC.rst @@ -1,4 +1,7 @@ -Deprecated Api Tri +Removal change template ~~~~~~~~~~~~~~~~~~~~~~~ -Removed the files involving Deprecated Api. +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. \ No newline at end of file From d89567af590a20674e15d7b1531100b7ca5e331a Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Thu, 28 Sep 2023 09:27:06 +0530 Subject: [PATCH 5/7] updated deprecated api tri --- doc/api/next_api_changes/removals/26909-VV.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/api/next_api_changes/removals/26909-VV.rst b/doc/api/next_api_changes/removals/26909-VV.rst index b3a4626b5c90..9be2ecb467df 100644 --- a/doc/api/next_api_changes/removals/26909-VV.rst +++ b/doc/api/next_api_changes/removals/26909-VV.rst @@ -1,5 +1,4 @@ - ``matplotlib.tri`` submodules are deprecated - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - The ``matplotlib.tri.*`` submodules are deprecated. All functionality is - available in ``matplotlib.tri`` directly and should be imported from there. \ No newline at end of file +``matplotlib.tri`` submodules are removed +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The ``matplotlib.tri.*`` submodules are removed. All functionality is +available in ``matplotlib.tri`` directly and should be imported from there. \ No newline at end of file From b0ec4a5c378fd21d940fb14a68291add7e4ce388 Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Fri, 29 Sep 2023 10:25:05 +0530 Subject: [PATCH 6/7] pre-commit.ci autofix --- doc/api/next_api_changes/removals/26909-VV.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/next_api_changes/removals/26909-VV.rst b/doc/api/next_api_changes/removals/26909-VV.rst index 9be2ecb467df..49e34ef375b8 100644 --- a/doc/api/next_api_changes/removals/26909-VV.rst +++ b/doc/api/next_api_changes/removals/26909-VV.rst @@ -1,4 +1,4 @@ ``matplotlib.tri`` submodules are removed ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The ``matplotlib.tri.*`` submodules are removed. All functionality is -available in ``matplotlib.tri`` directly and should be imported from there. \ No newline at end of file +available in ``matplotlib.tri`` directly and should be imported from there. \ No newline at end of file From 64180a2cfaa0954ccf69dbfa0caf018ae4424193 Mon Sep 17 00:00:00 2001 From: vigneshvetrivel8 Date: Fri, 29 Sep 2023 10:57:04 +0530 Subject: [PATCH 7/7] pre-commit.ci autofix --- doc/api/next_api_changes/removals/{26909-VV.rst => 26957-VV.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/api/next_api_changes/removals/{26909-VV.rst => 26957-VV.rst} (100%) diff --git a/doc/api/next_api_changes/removals/26909-VV.rst b/doc/api/next_api_changes/removals/26957-VV.rst similarity index 100% rename from doc/api/next_api_changes/removals/26909-VV.rst rename to doc/api/next_api_changes/removals/26957-VV.rst