??? rebase cleanup

Author: syntron

OMPython/ModelicaSystem.py

@@ -838,7 +838,7 @@ def _parse_om_version(version: str) -> tuple[int, int, int]:
     def _process_override_data(
             self,
             om_cmd: ModelExecutionCmd,
-            override_file: OMCPath,
+            override_file: OMPathBase,
             override_var: dict[str, str],
             override_sim: dict[str, str],
     ) -> None:
@@ -1682,7 +1682,7 @@ def sendExpression(self, expr: str, parsed: bool = True) -> Any:
         Wrapper for OMCSession.sendExpression().
         """
         try:
-            retval = self._session.sendExpression(command=expr, parsed=parsed)
+            retval = self._session.sendExpression(expr=expr, parsed=parsed)
         except OMCSessionException as ex:
             raise ModelicaSystemError(f"Error executing {repr(expr)}: {ex}") from ex
 

OMPython/OMCSession.py

@@ -756,7 +756,7 @@ def _tempdir(tempdir_base: OMPathBase) -> OMPathBase:
         return tempdir
 
     @abc.abstractmethod
-    def sendExpression(self, command: str, parsed: bool = True) -> Any:
+    def sendExpression(self, expr: str, parsed: bool = True) -> Any:
         """
         Function needed to send expressions to the OMC server via ZMQ.
         """
@@ -2023,8 +2023,8 @@ def write_text(self, data: str) -> int:
             try:
                 subprocess.run(cmdl, check=True)
                 return len(data)
-            except subprocess.CalledProcessError:
-                raise IOError(f"Error writing data to file {self.as_posix()}!")
+            except subprocess.CalledProcessError as exc:
+                raise IOError(f"Error writing data to file {self.as_posix()}!") from exc
 
         def mkdir(self, parents: bool = True, exist_ok: bool = False) -> None:
             """
@@ -2190,7 +2190,7 @@ def omcpath_tempdir(self, tempdir_base: Optional[OMPathBase] = None) -> OMPathBa
 
         return self._tempdir(tempdir_base=tempdir_base)
 
-    def sendExpression(self, command: str, parsed: bool = True) -> Any:
+    def sendExpression(self, expr: str, parsed: bool = True) -> Any:
         raise OMCSessionException(f"{self.__class__.__name__} does not uses an OMC server!")
 
 

OMPython/__init__.py

@@ -28,7 +28,6 @@
 )
 from OMPython.OMCSession import (
     OMCPath,
-    OMCSession,
 
     ModelExecutionData,
     ModelExecutionException,
@@ -41,7 +40,6 @@
     OMCSessionPort,
     OMCSessionLocal,
 
-    OMCPath,
     OMPathRunnerBash,
     OMPathRunnerLocal,
 
@@ -75,7 +73,6 @@
 
     'OMCPath',
 
-    'OMCSession',
     'ModelicaSystemCmd',
 
     'doe_get_solutions',
@@ -95,6 +92,8 @@
     'OMSessionRunner',
 
     'OMCSessionABC',
+    'OMCSessionDocker',
+    'OMCSessionDockerContainer',
     'OMCSessionWSL',
 
     'OMCProcessLocal',

tests/test_FMIRegression.py

@@ -1,9 +1,10 @@
 import os
 import pathlib
-import pytest
 import shutil
 import tempfile
 
+import pytest
+
 import OMPython
 
 

tests/test_OMCPath.py

@@ -14,6 +14,7 @@
     reason="OMCPath(non-local) only working for Python >= 3.12.",
 )
 
+
 def test_OMCPath_OMCSessionZMQ():
     om = OMPython.OMCSessionZMQ()