corrected import paths for symbols from the utils subpackage

dnv-opensource · Nov 5, 2024 · 0d21156 · 0d21156
1 parent 17a1f3d
commit 0d21156
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -15,7 +15,7 @@
 )
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def build_fmu():
     build_path = Path.cwd()
     build_path.mkdir(exist_ok=True)

diff --git a/tests/test_bouncing_ball_3d.py b/tests/test_bouncing_ball_3d.py
@@ -16,7 +16,7 @@
 from libcosimpy.CosimSlave import CosimLocalSlave
 
 from component_model.model import Model  # type: ignore
-from component_model.utils import model_from_fmu
+from component_model.utils.fmu import model_from_fmu
 
 
 def _in_interval(x: float, x0: float, x1: float):

diff --git a/tests/test_make_simpletable.py b/tests/test_make_simpletable.py
@@ -14,7 +14,7 @@
 from libcosimpy.CosimSlave import CosimLocalSlave
 
 from component_model.model import Model  # type: ignore
-from component_model.utils import make_osp_system_structure
+from component_model.utils.osp import make_osp_system_structure
 from tests.examples.input_table import InputTable
 
 

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -5,9 +5,9 @@
 
 import pytest
 
-from component_model.logger import get_module_logger  # type: ignore
 from component_model.model import Model  # type: ignore
-from component_model.utils import model_from_fmu
+from component_model.utils.fmu import model_from_fmu
+from component_model.utils.logger import get_module_logger  # type: ignore
 from component_model.variable import Check, Variable
 
 logger = get_module_logger(__name__, level=logging.INFO)

diff --git a/tests/test_pint.py b/tests/test_pint.py
@@ -4,7 +4,7 @@
 
 from pint import UnitRegistry
 
-from component_model.logger import get_module_logger  # type: ignore
+from component_model.utils.logger import get_module_logger  # type: ignore
 
 logger = get_module_logger(__name__, level=logging.INFO)
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -3,13 +3,9 @@
 import pytest
 
 from component_model.model import Model
-from component_model.utils import (
-    make_osp_system_structure,
-    model_from_fmu,
-    read_xml,
-    variables_from_fmu,
-    xml_to_python_val,
-)
+from component_model.utils.fmu import model_from_fmu, read_xml, variables_from_fmu
+from component_model.utils.osp import make_osp_system_structure
+from component_model.utils.xml import xml_to_python_val
 
 
 @pytest.fixture(scope="session")

diff --git a/tests/test_variable.py b/tests/test_variable.py
@@ -9,8 +9,8 @@
 from pythonfmu.enums import Fmi2Variability as Variability  # type: ignore
 
 from component_model.caus_var_ini import Initial
-from component_model.logger import get_module_logger  # type: ignore
 from component_model.model import Model  # type: ignore
+from component_model.utils.logger import get_module_logger  # type: ignore
 from component_model.variable import (  # type: ignore
     Check,
     Variable,