Backward compatibility for the privatized matplotlib.tri modules

timhoffm · timhoffm · commit 25f77d7ab4fb · 2022-10-26T03:37:05.000+02:00
diff --git a/.flake8 b/.flake8
@@ -60,7 +60,7 @@ per-file-ignores =
     lib/matplotlib/pyplot.py: F401, F811
     lib/matplotlib/tests/test_mathtext.py: E501
     lib/matplotlib/transforms.py: E201, E202, E203
-    lib/matplotlib/tri/triinterpolate.py: E201, E221
+    lib/matplotlib/tri/_triinterpolate.py: E201, E221
     lib/mpl_toolkits/axes_grid1/axes_size.py: E272
     lib/mpl_toolkits/axisartist/__init__.py: F401
     lib/mpl_toolkits/axisartist/angle_helper.py: E221
diff --git a/doc/api/next_api_changes/deprecations/24013-TH.rst b/doc/api/next_api_changes/deprecations/24013-TH.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.
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -621,8 +621,8 @@ def poisson_sparse_matrix(n, m):
     for itest in range(n*m):
         b = np.zeros(n*m, dtype=np.float64)
         b[itest] = 1.
-        x, _ = mtri.triinterpolate._cg(A=mat, b=b, x0=np.zeros(n*m),
-                                       tol=1.e-10)
+        x, _ = mtri._triinterpolate._cg(A=mat, b=b, x0=np.zeros(n*m),
+                                        tol=1.e-10)
         assert_array_almost_equal(np.dot(mat_dense, x), b)
 
     # 2) Same matrix with inserting 2 rows - cols with null diag terms
diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py
@@ -0,0 +1,9 @@
+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")
diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py
@@ -0,0 +1,9 @@
+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")
diff --git a/lib/matplotlib/tri/trifinder.py b/lib/matplotlib/tri/trifinder.py
@@ -0,0 +1,9 @@
+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")
diff --git a/lib/matplotlib/tri/triinterpolate.py b/lib/matplotlib/tri/triinterpolate.py
@@ -0,0 +1,9 @@
+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")
diff --git a/lib/matplotlib/tri/tripcolor.py b/lib/matplotlib/tri/tripcolor.py
@@ -0,0 +1,9 @@
+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")
diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py
@@ -0,0 +1,9 @@
+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")
diff --git a/lib/matplotlib/tri/trirefine.py b/lib/matplotlib/tri/trirefine.py
@@ -0,0 +1,9 @@
+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")
diff --git a/lib/matplotlib/tri/tritools.py b/lib/matplotlib/tri/tritools.py
@@ -0,0 +1,9 @@
+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")
