test fix

test/helpers.py

@@ -298,7 +298,7 @@ def generic_io(filename):
     with tempfile.TemporaryDirectory() as temp_dir:
         filepath = os.path.join(temp_dir, filename)
         meshio.write_points_cells(filepath, tri_mesh.points, tri_mesh.cells)
-        out_mesh = meshio.helpers.read(filepath)
+        out_mesh = meshio.read(filepath)
         assert (abs(out_mesh.points - tri_mesh.points) < 1.0e-15).all()
         assert (tri_mesh.cells["triangle"] == out_mesh.cells["triangle"]).all()
     return

test/test_abaqus.py

@@ -21,9 +21,9 @@
 )
 def test(mesh):
     def writer(*args, **kwargs):
-        return meshio.abaqus_io.write(*args, **kwargs)
+        return meshio._abaqus.write(*args, **kwargs)
 
-    helpers.write_read(writer, meshio.abaqus_io.read, mesh, 1.0e-15)
+    helpers.write_read(writer, meshio._abaqus.read, mesh, 1.0e-15)
     return
 
 

test/test_ansys.py

@@ -18,7 +18,7 @@
 @pytest.mark.parametrize("write_binary", [False, True])
 def test(mesh, write_binary):
     def writer(*args, **kwargs):
-        return meshio.ansys_io.write(*args, write_binary=write_binary, **kwargs)
+        return meshio._ansys.write(*args, write_binary=write_binary, **kwargs)
 
-    helpers.write_read(writer, meshio.ansys_io.read, mesh, 1.0e-15)
+    helpers.write_read(writer, meshio._ansys.read, mesh, 1.0e-15)
     return

test/test_cli.py

@@ -13,7 +13,7 @@ def test_cli():
 
     outfile = tempfile.NamedTemporaryFile().name
 
-    meshio.cli.main(
+    meshio._cli.main(
         [
             infile,
             outfile,

test/test_dolfin.py

@@ -17,8 +17,8 @@
         helpers.add_cell_data(helpers.tri_mesh, 1, dtype=numpy.int32),
     ],
 )
-def test_io(mesh):
-    helpers.write_read(meshio.dolfin_io.write, meshio.dolfin_io.read, mesh, 1.0e-15)
+def test_dolfin(mesh):
+    helpers.write_read(meshio._dolfin.write, meshio._dolfin.read, mesh, 1.0e-15)
     return
 
 

test/test_exodus.py

@@ -24,7 +24,7 @@
 
 @pytest.mark.parametrize("mesh", test_set)
 def test_io(mesh):
-    helpers.write_read(meshio.exodus_io.write, meshio.exodus_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._exodus.write, meshio._exodus.read, mesh, 1.0e-15)
     return
 
 

test/test_gmsh.py

@@ -44,9 +44,9 @@ def gmsh_periodic():
 )
 @pytest.mark.parametrize("write_binary", [False, True])
 def test_gmsh2(mesh, write_binary):
-    writer = partial(meshio.msh_io.write, fmt_version="2", write_binary=write_binary)
+    writer = partial(meshio._msh.write, fmt_version="2", write_binary=write_binary)
 
-    helpers.write_read(writer, meshio.msh_io.read, mesh, 1.0e-15)
+    helpers.write_read(writer, meshio._msh.read, mesh, 1.0e-15)
     return
 
 
@@ -75,9 +75,9 @@ def test_gmsh2(mesh, write_binary):
 )
 @pytest.mark.parametrize("write_binary", [False, True])
 def test_gmsh40(mesh, write_binary):
-    writer = partial(meshio.msh_io.write, fmt_version="4.0", write_binary=write_binary)
+    writer = partial(meshio._msh.write, fmt_version="4.0", write_binary=write_binary)
 
-    helpers.write_read(writer, meshio.msh_io.read, mesh, 1.0e-15)
+    helpers.write_read(writer, meshio._msh.read, mesh, 1.0e-15)
     return
 
 
@@ -107,9 +107,9 @@ def test_gmsh40(mesh, write_binary):
 )
 @pytest.mark.parametrize("write_binary", [False, True])
 def test_gmsh4(mesh, write_binary):
-    writer = partial(meshio.msh_io.write, fmt_version="4", write_binary=write_binary)
+    writer = partial(meshio._msh.write, fmt_version="4", write_binary=write_binary)
 
-    helpers.write_read(writer, meshio.msh_io.read, mesh, 1.0e-15)
+    helpers.write_read(writer, meshio._msh.read, mesh, 1.0e-15)
     return
 
 
@@ -144,8 +144,8 @@ def test_reference_file(filename, md5, ref_sum, ref_num_cells, write_binary):
         k: len(v["gmsh:physical"]) for k, v in mesh.cell_data.items()
     } == ref_num_cells
 
-    writer = partial(meshio.msh_io.write, fmt_version="2", write_binary=write_binary)
-    helpers.write_read(writer, meshio.msh_io.read, mesh, 1.0e-15)
+    writer = partial(meshio._msh.write, fmt_version="2", write_binary=write_binary)
+    helpers.write_read(writer, meshio._msh.read, mesh, 1.0e-15)
 
 
 @pytest.mark.parametrize(

test/test_mdpa.py

@@ -28,7 +28,7 @@
     ],
 )
 def test_io(mesh):
-    helpers.write_read(meshio.mdpa_io.write, meshio.mdpa_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._mdpa.write, meshio._mdpa.read, mesh, 1.0e-15)
     return
 
 

test/test_med.py

@@ -27,7 +27,7 @@
     ],
 )
 def test_io(mesh):
-    helpers.write_read(meshio.med_io.write, meshio.med_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._med.write, meshio._med.read, mesh, 1.0e-15)
     return
 
 
@@ -78,7 +78,7 @@ def test_reference_file_with_mixed_cells():
     }
     assert mesh.cell_tags == ref_cell_tags_info
 
-    helpers.write_read(meshio.med_io.write, meshio.med_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._med.write, meshio._med.read, mesh, 1.0e-15)
 
 
 def test_reference_file_with_point_cell_data():
@@ -121,4 +121,4 @@ def test_reference_file_with_point_cell_data():
     data_psi_elem = mesh.cell_data["hexahedron"]["resu____ENEL_ELEM"]
     assert numpy.isclose(numpy.mean(data_psi, axis=1)[0, 0], data_psi_elem[0])
 
-    helpers.write_read(meshio.med_io.write, meshio.med_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._med.write, meshio._med.read, mesh, 1.0e-15)

test/test_medit.py

@@ -16,7 +16,7 @@
     ],
 )
 def test_io(mesh):
-    helpers.write_read(meshio.medit_io.write, meshio.medit_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._medit.write, meshio._medit.read, mesh, 1.0e-15)
     return
 
 

test/test_moab.py

@@ -10,7 +10,7 @@
     "mesh", [helpers.tri_mesh, helpers.tri_mesh_2d, helpers.tet_mesh]
 )
 def test_io(mesh):
-    helpers.write_read(meshio.h5m_io.write, meshio.h5m_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._h5m.write, meshio._h5m.read, mesh, 1.0e-15)
     return
 
 

test/test_off.py

@@ -6,7 +6,7 @@
 
 @pytest.mark.parametrize("mesh", [helpers.tri_mesh])
 def test_io(mesh):
-    helpers.write_read(meshio.off_io.write, meshio.off_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._off.write, meshio._off.read, mesh, 1.0e-15)
     return
 
 

test/test_permas.py

@@ -9,7 +9,7 @@
     [helpers.tri_mesh, helpers.quad_mesh, helpers.tri_quad_mesh, helpers.tet_mesh],
 )
 def test_io(mesh):
-    helpers.write_read(meshio.permas_io.write, meshio.permas_io.read, mesh, 1.0e-15)
+    helpers.write_read(meshio._permas.write, meshio._permas.read, mesh, 1.0e-15)
     return
 
 

test/test_stl.py

@@ -15,7 +15,7 @@
 )
 def test_stl(mesh, write_binary, tol):
     def writer(*args, **kwargs):
-        return meshio.stl_io.write(*args, write_binary=write_binary, **kwargs)
+        return meshio._stl.write(*args, write_binary=write_binary, **kwargs)
 
-    helpers.write_read(writer, meshio.stl_io.read, mesh, tol)
+    helpers.write_read(writer, meshio._stl.read, mesh, tol)
     return

test/test_vtk.py

@@ -31,9 +31,9 @@
 @pytest.mark.parametrize("write_binary", [True, False])
 def test(mesh, write_binary):
     def writer(*args, **kwargs):
-        return meshio.vtk_io.write(*args, write_binary=write_binary, **kwargs)
+        return meshio._vtk.write(*args, write_binary=write_binary, **kwargs)
 
-    helpers.write_read(writer, meshio.vtk_io.read, mesh, 1.0e-15)
+    helpers.write_read(writer, meshio._vtk.read, mesh, 1.0e-15)
     return
 
 
@@ -57,8 +57,8 @@ def test_reference_file(filename, md5, ref_sum, ref_num_cells, write_binary):
     s = numpy.sum(mesh.points)
     assert abs(s - ref_sum) < tol * ref_sum
     assert len(mesh.cells["triangle"]) == ref_num_cells
-    writer = partial(meshio.vtk_io.write, write_binary=write_binary)
-    helpers.write_read(writer, meshio.vtk_io.read, mesh, 1.0e-15)
+    writer = partial(meshio._vtk.write, write_binary=write_binary)
+    helpers.write_read(writer, meshio._vtk.read, mesh, 1.0e-15)
     return
 
 

test/test_vtu.py

@@ -28,7 +28,7 @@
 @pytest.mark.parametrize("write_binary", [False, True])
 def test(mesh, write_binary):
     def writer(*args, **kwargs):
-        return meshio.vtu_io.write(
+        return meshio._vtu.write(
             *args,
             write_binary=write_binary,
             # don't use pretty xml to increase test coverage
@@ -39,7 +39,7 @@ def writer(*args, **kwargs):
     # ASCII files are only meant for debugging, VTK stores only 11 digits
     # <https://gitlab.kitware.com/vtk/vtk/issues/17038#note_264052>
     tol = 1.0e-15 if write_binary else 1.0e-11
-    helpers.write_read(writer, meshio.vtu_io.read, mesh, tol)
+    helpers.write_read(writer, meshio._vtu.read, mesh, tol)
     return
 
 

test/test_xdmf.py

@@ -37,9 +37,9 @@
 @pytest.mark.parametrize("data_format", ["XML", "Binary", "HDF"])
 def test_xdmf3(mesh, data_format):
     def write(*args, **kwargs):
-        return meshio.xdmf_io.write(*args, data_format=data_format, **kwargs)
+        return meshio._xdmf.write(*args, data_format=data_format, **kwargs)
 
-    helpers.write_read(write, meshio.xdmf_io.read, mesh, 1.0e-15)
+    helpers.write_read(write, meshio._xdmf.read, mesh, 1.0e-15)
     return