Make all matplotlib.tri submodules private

timhoffm · timhoffm · commit cf8e04ddc168 · 2022-10-26T03:37:05.000+02:00
Users should access all elements through the outer namespace
matplotlib.tri.

Back-compatibility for the old module names will be added in a separate
commit. If done in the same commit, git would interpret this as
a modified file plus a new file and not as a rename. With the separation
and the rename we keep the history.
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -614,7 +614,7 @@ def poisson_sparse_matrix(n, m):
 
     # Instantiating a sparse Poisson matrix of size 48 x 48:
     (n, m) = (12, 4)
-    mat = mtri.triinterpolate._Sparse_Matrix_coo(*poisson_sparse_matrix(n, m))
+    mat = mtri._triinterpolate._Sparse_Matrix_coo(*poisson_sparse_matrix(n, m))
     mat.compress_csc()
     mat_dense = mat.to_dense()
     # Testing a sparse solve for all 48 basis vector
@@ -635,16 +635,16 @@ def poisson_sparse_matrix(n, m):
     rows = np.concatenate([rows, [i_zero, i_zero-1, j_zero, j_zero-1]])
     cols = np.concatenate([cols, [i_zero-1, i_zero, j_zero-1, j_zero]])
     vals = np.concatenate([vals, [1., 1., 1., 1.]])
-    mat = mtri.triinterpolate._Sparse_Matrix_coo(vals, rows, cols,
-                                                 (n*m + 2, n*m + 2))
+    mat = mtri._triinterpolate._Sparse_Matrix_coo(vals, rows, cols,
+                                                  (n*m + 2, n*m + 2))
     mat.compress_csc()
     mat_dense = mat.to_dense()
     # Testing a sparse solve for all 50 basis vec
     for itest in range(n*m + 2):
         b = np.zeros(n*m + 2, dtype=np.float64)
         b[itest] = 1.
-        x, _ = mtri.triinterpolate._cg(A=mat, b=b, x0=np.ones(n*m + 2),
-                                       tol=1.e-10)
+        x, _ = mtri._triinterpolate._cg(A=mat, b=b, x0=np.ones(n * m + 2),
+                                        tol=1.e-10)
         assert_array_almost_equal(np.dot(mat_dense, x), b)
 
     # 3) Now a simple test that summation of duplicate (i.e. with same rows,
@@ -655,7 +655,7 @@ def poisson_sparse_matrix(n, m):
     cols = np.array([0, 1, 2, 1, 1, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2],
                     dtype=np.int32)
     dim = (3, 3)
-    mat = mtri.triinterpolate._Sparse_Matrix_coo(vals, rows, cols, dim)
+    mat = mtri._triinterpolate._Sparse_Matrix_coo(vals, rows, cols, dim)
     mat.compress_csc()
     mat_dense = mat.to_dense()
     assert_array_almost_equal(mat_dense, np.array([
@@ -678,7 +678,7 @@ def test_triinterpcubic_geom_weights():
         y_rot = -np.sin(theta)*x + np.cos(theta)*y
         triang = mtri.Triangulation(x_rot, y_rot, triangles)
         cubic_geom = mtri.CubicTriInterpolator(triang, z, kind='geom')
-        dof_estimator = mtri.triinterpolate._DOF_estimator_geom(cubic_geom)
+        dof_estimator = mtri._triinterpolate._DOF_estimator_geom(cubic_geom)
         weights = dof_estimator.compute_geom_weights()
         # Testing for the 4 possibilities...
         sum_w[0, :] = np.sum(weights, 1) - 1
diff --git a/lib/matplotlib/tri/__init__.py b/lib/matplotlib/tri/__init__.py
@@ -2,15 +2,15 @@
 Unstructured triangular grid functions.
 """
 
-from .triangulation import Triangulation
-from .tricontour import TriContourSet, tricontour, tricontourf
-from .trifinder import TriFinder, TrapezoidMapTriFinder
-from .triinterpolate import (TriInterpolator, LinearTriInterpolator,
-                             CubicTriInterpolator)
-from .tripcolor import tripcolor
-from .triplot import triplot
-from .trirefine import TriRefiner, UniformTriRefiner
-from .tritools import TriAnalyzer
+from ._triangulation import Triangulation
+from ._tricontour import TriContourSet, tricontour, tricontourf
+from ._trifinder import TriFinder, TrapezoidMapTriFinder
+from ._triinterpolate import (TriInterpolator, LinearTriInterpolator,
+                              CubicTriInterpolator)
+from ._tripcolor import tripcolor
+from ._triplot import triplot
+from ._trirefine import TriRefiner, UniformTriRefiner
+from ._tritools import TriAnalyzer
 
 
 __all__ = ["Triangulation",
diff --git a/lib/matplotlib/tri/_triangulation.py b/lib/matplotlib/tri/_triangulation.py
@@ -192,7 +192,7 @@ def get_trifinder(self):
         """
         if self._trifinder is None:
             # Default TriFinder class.
-            from matplotlib.tri.trifinder import TrapezoidMapTriFinder
+            from matplotlib.tri._trifinder import TrapezoidMapTriFinder
             self._trifinder = TrapezoidMapTriFinder(self)
         return self._trifinder
 
diff --git a/lib/matplotlib/tri/_tricontour.py b/lib/matplotlib/tri/_tricontour.py
@@ -2,7 +2,7 @@
 
 from matplotlib import _docstring
 from matplotlib.contour import ContourSet
-from matplotlib.tri.triangulation import Triangulation
+from matplotlib.tri._triangulation import Triangulation
 
 
 @_docstring.dedent_interpd
diff --git a/lib/matplotlib/tri/_trifinder.py b/lib/matplotlib/tri/_trifinder.py
diff --git a/lib/matplotlib/tri/_triinterpolate.py b/lib/matplotlib/tri/_triinterpolate.py
@@ -6,8 +6,8 @@
 
 from matplotlib import _api
 from matplotlib.tri import Triangulation
-from matplotlib.tri.trifinder import TriFinder
-from matplotlib.tri.tritools import TriAnalyzer
+from matplotlib.tri._trifinder import TriFinder
+from matplotlib.tri._tritools import TriAnalyzer
 
 __all__ = ('TriInterpolator', 'LinearTriInterpolator', 'CubicTriInterpolator')
 
diff --git a/lib/matplotlib/tri/_tripcolor.py b/lib/matplotlib/tri/_tripcolor.py
@@ -3,7 +3,7 @@
 from matplotlib import _api
 from matplotlib.collections import PolyCollection, TriMesh
 from matplotlib.colors import Normalize
-from matplotlib.tri.triangulation import Triangulation
+from matplotlib.tri._triangulation import Triangulation
 
 
 def tripcolor(ax, *args, alpha=1.0, norm=None, cmap=None, vmin=None,
diff --git a/lib/matplotlib/tri/_triplot.py b/lib/matplotlib/tri/_triplot.py
@@ -1,5 +1,5 @@
 import numpy as np
-from matplotlib.tri.triangulation import Triangulation
+from matplotlib.tri._triangulation import Triangulation
 import matplotlib.cbook as cbook
 import matplotlib.lines as mlines
 
diff --git a/lib/matplotlib/tri/_trirefine.py b/lib/matplotlib/tri/_trirefine.py
@@ -5,8 +5,8 @@
 import numpy as np
 
 from matplotlib import _api
-from matplotlib.tri.triangulation import Triangulation
-import matplotlib.tri.triinterpolate
+from matplotlib.tri._triangulation import Triangulation
+import matplotlib.tri._triinterpolate
 
 
 class TriRefiner:
diff --git a/lib/matplotlib/tri/_tritools.py b/lib/matplotlib/tri/_tritools.py
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -32,7 +32,7 @@
 from matplotlib.axes import Axes
 from matplotlib.axes._base import _axis_method_wrapper, _process_plot_format
 from matplotlib.transforms import Bbox
-from matplotlib.tri.triangulation import Triangulation
+from matplotlib.tri._triangulation import Triangulation
 
 from . import art3d
 from . import proj3d
@@ -2153,7 +2153,7 @@ def tricontour(self, *args,
 
         Returns
         -------
-        matplotlib.tri.tricontour.TriContourSet
+        matplotlib.tri._tricontour.TriContourSet
         """
         had_data = self.has_data()
 
@@ -2246,7 +2246,7 @@ def tricontourf(self, *args, zdir='z', offset=None, **kwargs):
 
         Returns
         -------
-        matplotlib.tri.tricontour.TriContourSet
+        matplotlib.tri._tricontour.TriContourSet
         """
         had_data = self.has_data()
 
