Skip to content

Commit 783cfbb

Browse files
committed
Changed my mind
1 parent b8c1553 commit 783cfbb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ juliacall
44
matplotlib
55
monotonic
66
natsort
7-
OMPython==3.6
7+
OMPython==4.0
88
psutil
99
simplejson

test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ def target():
267267

268268
print("Start OMC version")
269269

270-
if ompython_omhome != "":
270+
if not docker:
271271
# Use a different OMC for running OMPython than for running the tests
272272
omhome = os.environ["OPENMODELICAHOME"]
273273
omc_version = check_output_log(omc_cmd + ["--version"], stderr=subprocess.STDOUT).decode("ascii").strip()
@@ -276,7 +276,7 @@ def target():
276276
ompython_omc_version=omc.sendExpression('getVersion()')
277277
os.environ["OPENMODELICAHOME"] = omhome
278278
else:
279-
omc = OMCProcessDocker(docker=docker, dockerExtraArgs=dockerExtraArgs)
279+
omc = OMCSessionZMQ(docker=docker, dockerExtraArgs=dockerExtraArgs)
280280
omhome=omc.sendExpression('getInstallationDirectoryPath()')
281281
omc_version=omc.sendExpression('getVersion()')
282282
ompython_omc_version=omc_version

0 commit comments

Comments
 (0)