[ModelicaSystem] use packaging.version.Version to replace parse_om_version()

Author: syntron

OMPython/ModelicaSystem.py

@@ -11,14 +11,14 @@
 import os
 import pathlib
 import queue
-import re
 import textwrap
 import threading
 from typing import Any, cast, Optional
 import warnings
 import xml.etree.ElementTree as ET
 
 import numpy as np
+from packaging.version import Version
 
 from OMPython.OMCSession import (
     OMCSessionException,
@@ -350,7 +350,10 @@ def __init__(
             self._session = OMCSessionLocal(omhome=omhome)
 
         # get OpenModelica version
-        self._version = self._session.sendExpression("getVersion()", parsed=True)
+        version_str = self._session.sendExpression("getVersion()", parsed=True)
+        # remove 'OpenModelica ' at the start of the string and possible development ids (i.e. '~dev-26-g10bb273')
+        version_str = version_str[13:version_str.find('~')]
+        self._version = Version(version_str)
         # set commandLineOptions using default values or the user defined list
         if command_line_options is None:
             # set default command line options to improve the performance of linearization and to avoid recompilation if
@@ -1022,13 +1025,6 @@ def getOptimizationOptions(
 
         raise ModelicaSystemError("Unhandled input for getOptimizationOptions()")
 
-    def parse_om_version(self, version: str) -> tuple[int, int, int]:
-        match = re.search(r"v?(\d+)\.(\d+)\.(\d+)", version)
-        if not match:
-            raise ValueError(f"Version not found in: {version}")
-        major, minor, patch = map(int, match.groups())
-        return major, minor, patch
-
     def simulate_cmd(
             self,
             result_file: OMCPath,
@@ -1078,8 +1074,7 @@ def simulate_cmd(
             # simulation options are not read from override file from version >= 1.26.0,
             # pass them to simulation executable directly as individual arguments
             # see https://github.com/OpenModelica/OpenModelica/pull/14813
-            major, minor, patch = self.parse_om_version(self._version)
-            if (major, minor, patch) >= (1, 26, 0):
+            if self._version >= Version("1.26.0"):
                 for key, opt_value in self._simulate_options_override.items():
                     om_cmd.arg_set(key=key, val=str(opt_value))
                 override_content = (
@@ -1775,8 +1770,7 @@ def linearize(
         )
 
         # See comment in simulate_cmd regarding override file and OM version
-        major, minor, patch = self.parse_om_version(self._version)
-        if (major, minor, patch) >= (1, 26, 0):
+        if self._version >= Version("1.26.0"):
             for key, opt_value in self._linearization_options.items():
                 om_cmd.arg_set(key=key, val=str(opt_value))
             override_content = (

pyproject.toml

@@ -17,6 +17,7 @@ license = { file = "LICENSE" }
 requires-python = ">=3.10"
 dependencies = [
     "numpy",
+    "packaging",
     "psutil",
     "pyparsing",
     "pyzmq",