Return version and date

src/simstadt/__init__.py

@@ -8,27 +8,28 @@ from .results import (
     SolarPotentialResults,
     create_simstadt_results,
 )
-from .runner import run_workflow_with_citygml, run_regionchooser
+from .runner import run_workflow_with_citygml, run_regionchooser, get_version_and_date
 from .utils import clean_old_workflows
 from .workflows import greenwater_simulation, heatdemand_simulation, photovoltaic_simulation
 
 # TODO: Define Template class, with already defined Workflows?
 
 __all__ = [
-    "KPI",
-    "SimStadtResults",
+    "GreenWaterResults",
     "HeatDemandResults",
+    "KPI",
     "LoadProfileResults",
     "PhotovoltaicResults",
-    "GreenWaterResults",
+    "SimStadtResults",
     "SolarPotentialResults",
-    "create_simstadt_results",
     "clean_old_workflows",
-    "run_workflow_with_citygml",
-    "run_regionchooser",
-    "photovoltaic_simulation",
-    "heatdemand_simulation",
+    "create_simstadt_results",
+    "get_version_and_date",
     "greenwater_simulation",
+    "heatdemand_simulation",
+    "photovoltaic_simulation",
+    "run_regionchooser",
+    "run_workflow_with_citygml",
 ]
 
 

src/simstadt/runner.py

@@ -67,6 +67,14 @@ def get_template_path() -> Path:
         "No template path found. Set SIMSTADT_TEMPLATE_PATH or create a templates/ directory."
     )
 
+def get_version_and_date() -> tuple[str, str]:
+    SIMSTADT_VERSION_FORMAT = re.compile(r"Launching SimStadt (\S+) \((\w+), rev. (\w+), (\d+)\)")
+    output = get_simstadt_output(get_simstadt_folder())
+    m = SIMSTADT_VERSION_FORMAT.search(output)
+    if not m:
+        raise ValueError(f"No SimStadt version string found in output:\n{output}")
+    version, _branch, _commit, date = m.groups()
+    return version, date
 
 # ---------------------------------------------------------------------------
 # Low-level workflow helpers

tests/test_version.py

@@ -4,7 +4,7 @@ import re
 
 import pytest
 
-from simstadt.runner import get_simstadt_output
+from simstadt import get_version_and_date
 
 SIMSTADT_MIN_VERSION = "0.14.0"
 SIMSTADT_MIN_DATE = "20250701"
@@ -14,11 +14,7 @@ SIMSTADT_VERSION_FORMAT = re.compile(r"Launching SimStadt (\S+) \((\w+), rev. (\
 
 @pytest.mark.integration
 def test_version(simstadt_folder):
-    output = get_simstadt_output(simstadt_folder)
-    m = SIMSTADT_VERSION_FORMAT.search(output)
-    if not m:
-        pytest.fail(f"No SimStadt version string found in output:\n{output}")
-    version, _branch, _commit, date = m.groups()
+    version, date = get_version_and_date()
     assert version >= SIMSTADT_MIN_VERSION, (
         f"SimStadt version {version} is older than required {SIMSTADT_MIN_VERSION}.\n"
         "https://simstadt.hft-stuttgart.de/download/InstallFiles/SimStadt2_latest.zip"