Updating to OMPython 4.0

.github/workflows/test.yml

@@ -53,6 +53,7 @@ jobs:
       - name: Install Python dependencies
         shell: bash
         run: |
+          sed -i '/^juliacall/d' requirements.txt # Remove juliacall to check if it works without
           pip install -r requirements.txt
 
       - name: Run library test

requirements.txt

@@ -4,6 +4,6 @@ juliacall
 matplotlib
 monotonic
 natsort
-ompython
+OMPython==4.0
 psutil
 simplejson

test.py

@@ -260,14 +260,14 @@ def target():
   print("Error: Expected at least one configuration file to start the library test")
   sys.exit(1)
 
-from OMPython import OMCSession, OMCSessionZMQ
+from OMPython import OMCSessionZMQ, OMCProcessDocker
 
 # Try to make the processes a bit nicer...
 os.environ["GC_MARKERS"]="1"
 
 print("Start OMC version")
 
-if ompython_omhome != "":
+if not docker:
   # Use a different OMC for running OMPython than for running the tests
   omhome = os.environ["OPENMODELICAHOME"]
   omc_version = check_output_log(omc_cmd + ["--version"], stderr=subprocess.STDOUT).decode("ascii").strip()

testmodel.py

@@ -5,7 +5,7 @@
 from asyncio.subprocess import STDOUT
 import simplejson as json
 from monotonic import monotonic
-from OMPython import FindBestOMCSession, OMCSession, OMCSessionZMQ
+from OMPython import OMCSession, OMCSessionZMQ
 import shared, glob
 
 parser = argparse.ArgumentParser(description='OpenModelica library testing tool helper (single model)')