fixing imports

.gitignore

@@ -136,3 +136,4 @@ dmypy.json
 *.vtk
 *.stp
 src/_version.py
+*.msh

src/cad_to_dagmc/__init__.py

@@ -13,9 +13,4 @@
 
 __all__ = ["__version__"]
 
-from .core import CadToDagmc
-from .vertices_to_h5m import vertices_to_h5m
-from .brep_part_finder import *
-from .brep_to_h5m import *
-
-[CadToDagmc, vertices_to_h5m]
+from .core import *

tests/test_h5m_in_transport.py

@@ -1,6 +1,5 @@
 import openmc
 from cad_to_dagmc import CadToDagmc
-import math
 import cadquery as cq
 
 
@@ -31,7 +30,6 @@ def transport_particles_on_h5m_geometry(
 
     """
 
-    import openmc
     from openmc.data import NATURAL_ABUNDANCE
 
     if nuclides is None:

tests/test_loading_from_file_vs_shape_object.py

@@ -1,5 +1,6 @@
 # TODO test brep_part_finder
-from cad_to_dagmc import order_material_ids_by_brep_order
+# from cad_to_dagmc import order_material_ids_by_brep_order
+import cad_to_dagmc
 
 # def get_ids_from_assembly(assembly):
 #     ids = []
@@ -17,23 +18,23 @@
 
 def test_order_material_ids_by_brep_order():
     # two entries, reverse order
-    new_order = order_material_ids_by_brep_order(["1", "2"], ["2", "1"], ["m1", "m2"])
+    new_order = cad_to_dagmc.order_material_ids_by_brep_order(["1", "2"], ["2", "1"], ["m1", "m2"])
     assert new_order == ["m2", "m1"]
 
     # three entries, partly duplicate materials
-    new_order = order_material_ids_by_brep_order(
+    new_order = cad_to_dagmc.order_material_ids_by_brep_order(
         ["1", "2", "3"], ["2", "1", "3"], ["m1", "m2", "m2"]
     )
     assert new_order == ["m2", "m1", "m2"]
 
     # three entries, unique materials
-    new_order = order_material_ids_by_brep_order(
+    new_order = cad_to_dagmc.order_material_ids_by_brep_order(
         ["1", "2", "3"], ["2", "1", "3"], ["m1", "m2", "m3"]
     )
     assert new_order == ["m2", "m1", "m3"]
 
     # three entries, duplicate materials
-    new_order = order_material_ids_by_brep_order(
+    new_order = cad_to_dagmc.order_material_ids_by_brep_order(
         ["1", "2", "3"], ["2", "1", "3"], ["m1", "m1", "m1"]
     )
     assert new_order == ["m1", "m1", "m1"]

tests/test_package.py

@@ -5,7 +5,7 @@
 import pymoab as mb
 from pymoab import core, types
 
-from cad_to_dagmc import vertices_to_h5m
+# from cad_to_dagmc import vertices_to_h5m
 
 """
 Tests that check that: