???

Author: syntron

OMPython/ModelicaSystem.py

@@ -1765,6 +1765,7 @@ def __init__(
         self._simargs = simargs
         self._timeout = timeout
 
+        # TODO: Update her & all path handling of this class
         if isinstance(resultpath, pathlib.Path):
             self._resultpath = resultpath
         else:

tests/test_ModelicaSystemDoE.py

@@ -2,6 +2,17 @@
 import OMPython
 import pathlib
 import pytest
+import sys
+
+skip_on_windows = pytest.mark.skipif(
+    sys.platform.startswith("win"),
+    reason="OpenModelica Docker image is Linux-only; skipping on Windows.",
+)
+
+skip_python_older_312 = pytest.mark.skipif(
+    sys.version_info < (3, 12),
+    reason="OMCPath(non-local) only working for Python >= 3.12.",
+)
 
 
 @pytest.fixture
@@ -37,7 +48,25 @@ def param_doe() -> dict[str, list]:
     return param
 
 
-def test_ModelicaSystemDoE(tmp_path, model_doe, param_doe):
+@pytest.mark.skip(reason="No OMC")
+def test_ModelicaSystemDoE_local(tmp_path, model_doe, param_doe):
+    tmpdir = tmp_path / 'DoE'
+    tmpdir.mkdir(exist_ok=True)
+
+    doe_mod = OMPython.ModelicaSystemDoE(
+        fileName=model_doe.as_posix(),
+        modelName="M",
+        parameters=param_doe,
+        resultpath=tmpdir,
+        simargs={"override": {'stopTime': 1.0}},
+    )
+
+    _run_ModelicaSystemDoe(doe_mod=doe_mod)
+
+
+@skip_on_windows
+@skip_python_older_312
+def test_ModelicaSystemDoE_docker(tmp_path, model_doe, param_doe):
     tmpdir = tmp_path / 'DoE'
     tmpdir.mkdir(exist_ok=True)
 
@@ -48,6 +77,28 @@ def test_ModelicaSystemDoE(tmp_path, model_doe, param_doe):
         resultpath=tmpdir,
         simargs={"override": {'stopTime': 1.0}},
     )
+
+    _run_ModelicaSystemDoe(doe_mod=doe_mod)
+
+
+@pytest.mark.skip(reason="Not able to run WSL on github")
+@skip_python_older_312
+def test_ModelicaSystemDoE_WSL(tmp_path, model_doe, param_doe):
+    tmpdir = tmp_path / 'DoE'
+    tmpdir.mkdir(exist_ok=True)
+
+    doe_mod = OMPython.ModelicaSystemDoE(
+        fileName=model_doe.as_posix(),
+        modelName="M",
+        parameters=param_doe,
+        resultpath=tmpdir,
+        simargs={"override": {'stopTime': 1.0}},
+    )
+
+    _run_ModelicaSystemDoe(doe_mod=doe_mod)
+
+
+def _run_ModelicaSystemDoe(doe_mod):
     doe_count = doe_mod.prepare()
     assert doe_count == 16