Merge pull request #79 from isteinbrecher/fix_relative_imports_in_tes…

…ting Fix relative imports in testing
imcs-compsim · Jun 10, 2024 · 72c7dfe · 72c7dfe
2 parents ac773ee + da6f7e5
commit 72c7dfe
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 17 deletions.
diff --git a/tests/performance_testing.py b/tests/performance_testing.py
@@ -54,7 +54,7 @@
 from meshpy.geometric_search import FindClosePointAlgorithm, find_close_points
 from meshpy.mesh_creation_functions.beam_basic_geometry import create_beam_mesh_line
 
-from utilities import empty_testing_directory, testing_temp
+from utils import empty_testing_directory, testing_temp
 
 # Cubitpy imports.
 from cubitpy import cupy, CubitPy

diff --git a/tests/testing_abaqus.py b/tests/testing_abaqus.py
@@ -52,7 +52,7 @@
 from meshpy.mesh_creation_functions.beam_basic_geometry import create_beam_mesh_line
 
 # Testing imports
-from utilities import compare_test_result
+from utils import compare_test_result
 
 
 class TestAbaqusMeshpy(unittest.TestCase):

diff --git a/tests/testing_four_c.py b/tests/testing_four_c.py
@@ -38,7 +38,7 @@
 import numpy as np
 
 # Testing imports.
-from utilities import compare_test_result
+from utils import compare_test_result
 
 # Meshpy imports.
 from meshpy import (

diff --git a/tests/testing_four_c_simulation.py b/tests/testing_four_c_simulation.py
@@ -41,7 +41,7 @@
 import glob
 
 # Testing imports.
-from utilities import (
+from utils import (
     compare_test_result,
     get_four_c_path,
     testing_temp,

diff --git a/tests/testing_header_functions.py b/tests/testing_header_functions.py
@@ -48,7 +48,7 @@
 )
 
 # Testing imports.
-from utilities import compare_test_result
+from utils import compare_test_result
 
 
 class TestHeaderFunctions(unittest.TestCase):

diff --git a/tests/testing_main.py b/tests/testing_main.py
@@ -37,7 +37,7 @@
 import unittest
 
 # Import testing functions.
-from utilities import empty_testing_directory
+from utils import empty_testing_directory
 
 
 if __name__ == "__main__":

diff --git a/tests/testing_mesh_creation_functions.py b/tests/testing_mesh_creation_functions.py
@@ -70,7 +70,7 @@
 )
 
 # Testing imports.
-from utilities import testing_input, compare_test_result, compare_strings
+from utils import testing_input, compare_test_result, compare_strings
 
 
 def create_helix_function(

diff --git a/tests/testing_meshpy.py b/tests/testing_meshpy.py
@@ -84,7 +84,7 @@
 from meshpy.mesh_creation_functions.beam_curve import create_beam_mesh_curve
 
 # Testing imports.
-from utilities import (
+from utils import (
     skip_fail_test,
     testing_temp,
     testing_input,
@@ -1636,7 +1636,7 @@ def test_meshpy_cubitpy_import(self):
             skip_fail_test(self, "CubitPy could not be loaded!")
 
         # Load the mesh creation functions.
-        from create_cubit_input import create_tube, create_tube_cubit
+        from meshpy_testing.create_cubit_input import create_tube, create_tube_cubit
 
         # Create the input file and read the file.
         file_path = os.path.join(testing_temp, "test_cubitpy_import.dat")

diff --git a/tests/testing_nurbs.py b/tests/testing_nurbs.py
@@ -56,7 +56,7 @@
 )
 
 # Testing imports
-from utilities import testing_input, compare_test_result
+from utils import testing_input, compare_test_result
 
 
 class TestNurbsMeshCreationFunction(unittest.TestCase):

diff --git a/tests/testing_simulation_manager.py b/tests/testing_simulation_manager.py
@@ -53,12 +53,7 @@
 )
 from meshpy.mesh_creation_functions import create_beam_mesh_line
 from meshpy.simulation_manager import Simulation, SimulationManager
-from utilities import (
-    testing_temp,
-    get_four_c_path,
-    testing_input,
-    compare_test_result,
-)
+from utils import testing_temp, get_four_c_path, testing_input, compare_test_result
 
 
 def is_cluster_test():

diff --git a/tests/testing_tutorial.py b/tests/testing_tutorial.py
@@ -41,7 +41,7 @@
 import meshpy_tutorial
 
 # Import testing utilities.
-from utilities import testing_temp, compare_test_result
+from utils import testing_temp, compare_test_result
 
 
 class TestTutorial(unittest.TestCase):

diff --git a/tests/utilities.py → tests/utils.py b/tests/utilities.py → tests/utils.py