From 53a550c7709f45d50a1bf749761b7c1e5995f24a Mon Sep 17 00:00:00 2001 From: Robert Braun Date: Mon, 28 Apr 2025 15:38:46 +0200 Subject: [PATCH 1/2] Update Ubuntu verison for CI --- .github/workflows/ci-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index db8c478..2d6b983 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -65,7 +65,7 @@ jobs: cmake-ubuntu: timeout-minutes: 5 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/setup-python@v5 with: @@ -95,7 +95,7 @@ jobs: cmake-ubuntu-python: timeout-minutes: 5 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/setup-python@v5 with: From 492f3578e71346a15279c8761157fcc4fe4101a5 Mon Sep 17 00:00:00 2001 From: Robert Braun Date: Tue, 6 May 2025 09:43:34 +0200 Subject: [PATCH 2/2] Fix minor errors in Python test files --- fmi4c.py | 2 +- test/pytest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fmi4c.py b/fmi4c.py index 70129be..5984585 100644 --- a/fmi4c.py +++ b/fmi4c.py @@ -168,7 +168,7 @@ def __init__(self): self.hdll.fmi1_getModelTypesPlatform.restype = ct.c_char_p self.hdll.fmi1_getModelTypesPlatform.argtypes = ct.c_void_p, self.hdll.fmi1_instantiateModel.restype = ct.c_void_p - self.hdll.fmi1_instantiateModel.argtypes = ct.c_void_p,ct.c_void_p,ct.c_void_p,ct.c_bool, + self.hdll.fmi1_instantiateModel.argtypes = ct.c_void_p,ct.c_void_p,ct.c_void_p,ct.c_void_p,ct.c_bool, self.hdll.fmi1_freeModelInstance.restype = None self.hdll.fmi1_freeModelInstance.argtypes = ct.c_void_p, self.hdll.fmi1_setTime.restype = ct.c_int diff --git a/test/pytest.py b/test/pytest.py index b2ae2b8..afae9fc 100644 --- a/test/pytest.py +++ b/test/pytest.py @@ -210,11 +210,11 @@ def verify(name, value): verify("version", version) instance = 0 -instance = instantiateSuccess = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False) +instance = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False) verify("instantiateSuccess", instance != 0) instance2 = 0 -instance2 = instantiateSuccess = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False) +instance2 = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False) verify("instantiateSuccess", instance2 != 0) setDebugLoggingSuccess = f.fmi1_setDebugLogging(instance, True)