From cadf0a70ae58491eb631b36770637c71db5cd8b6 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Fri, 30 Jan 2026 08:25:44 +0100 Subject: [PATCH 01/17] Add matrix with Python versions up to Python 3.13 to CI --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 91be4b8..db0c1b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,11 @@ on: jobs: test: + name: test (${{matrix.python-version}}) runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - name: Checkout repository @@ -16,7 +20,8 @@ jobs: - name: Set up Miniconda uses: conda-incubator/setup-miniconda@v3 with: - python-version: '3.10' + auto-update-conda: true + python-version: ${{ matrix.python-version }} activate-environment: testim8 environment-file: environment.yml auto-activate-base: false From 262a4fff4cfea5217710acd645623a60e4d53114 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Fri, 30 Jan 2026 08:26:36 +0100 Subject: [PATCH 02/17] Bump project Python version up to 3.13 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 79ed89d..d67b142 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ authors = [ ] description = "A parameter estimation tool for DAE models implemented compliant to the Functional Mockup Interface" readme = "README.md" -requires-python = ">=3.10.0,<3.13" +requires-python = ">=3.10.0,<=3.13" license = {text = "AGPLv3"} classifiers=[ "Programming Language :: Python :: 3", From 26f27c48ce1fbf10ecebf32be7a4aa394e9eb41b Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Fri, 30 Jan 2026 14:31:12 +0100 Subject: [PATCH 03/17] Pin ubuntu:24.04 in CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db0c1b0..1a2c640 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: jobs: test: name: test (${{matrix.python-version}}) - runs-on: ubuntu-latest + runs-on: ubuntu:24.04 strategy: matrix: python-version: ["3.10", "3.11", "3.12", "3.13"] From 9ca4edbfe3ef3988e4148bde9165c16c278afd52 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Fri, 6 Feb 2026 14:35:30 +0100 Subject: [PATCH 04/17] Fix syntax error in runner tag --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1a2c640..c3da400 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: jobs: test: name: test (${{matrix.python-version}}) - runs-on: ubuntu:24.04 + runs-on: ubuntu-24.04 strategy: matrix: python-version: ["3.10", "3.11", "3.12", "3.13"] From bd9034285f625ec28602c48d55f52b34c58011ca Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Fri, 6 Feb 2026 15:13:11 +0100 Subject: [PATCH 05/17] Pin OM action version, add omsimulator package --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c3da400..53a2e5c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,9 +29,10 @@ jobs: - name: setup OpenModelica compiler uses: OpenModelica/setup-openmodelica@v1.0 with: - version: 'stable' + version: '1.25.5' packages: | - omc + 'omc' + 'omsimulator' libraries: | 'Modelica 4.0.0' From ba1927151034f082e995293534c98c822f4fd15e Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Mon, 9 Feb 2026 08:38:44 +0100 Subject: [PATCH 06/17] Pin ubuntu-22:04 for CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 53a2e5c..c09c2f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: jobs: test: name: test (${{matrix.python-version}}) - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: ["3.10", "3.11", "3.12", "3.13"] From e25d820e1e4023b55bb953f5d63359bfa346836a Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Mon, 9 Feb 2026 13:40:45 +0100 Subject: [PATCH 07/17] Pin setup-openmodelica v1.0.2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c09c2f7..d28a92c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: auto-activate-base: false - name: setup OpenModelica compiler - uses: OpenModelica/setup-openmodelica@v1.0 + uses: OpenModelica/setup-openmodelica@v1.0.2 with: version: '1.25.5' packages: | From 283696ea8e0de1b68ddcfd27e7ea6271ea13c19d Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Mon, 9 Feb 2026 13:58:58 +0100 Subject: [PATCH 08/17] use stable setup-openmodelica --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d28a92c..f9958b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: setup OpenModelica compiler uses: OpenModelica/setup-openmodelica@v1.0.2 with: - version: '1.25.5' + version: 'stable' packages: | 'omc' 'omsimulator' From 040fb6950f4f8ed0c87241b8a523226a800101b1 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Tue, 10 Feb 2026 08:38:47 +0100 Subject: [PATCH 09/17] Fix job order to avoid conda messing with omc compilers --- .github/workflows/test.yml | 25 +++++++++++++++---------- environment.yml | 4 +--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f9958b6..b3c09c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: jobs: test: name: test (${{matrix.python-version}}) - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: matrix: python-version: ["3.10", "3.11", "3.12", "3.13"] @@ -17,15 +17,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up Miniconda - uses: conda-incubator/setup-miniconda@v3 - with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} - activate-environment: testim8 - environment-file: environment.yml - auto-activate-base: false - - name: setup OpenModelica compiler uses: OpenModelica/setup-openmodelica@v1.0.2 with: @@ -36,11 +27,25 @@ jobs: libraries: | 'Modelica 4.0.0' + - uses: actions/setup-python@v6 + with: + python-version: 'pypy3.13' + - run: pip install OMPython + - name: compile FMU shell: bash -l {0} run: | python tests/test_data/model_compilation.py --modelname Growth + - name: Set up Miniconda + uses: conda-incubator/setup-miniconda@v3 + with: + auto-update-conda: true + python-version: ${{ matrix.python-version }} + activate-environment: testim8 + environment-file: environment.yml + auto-activate-base: false + - name: Run tests shell: bash -l {0} run: | diff --git a/environment.yml b/environment.yml index 5b331b3..6168e75 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,7 @@ channels: dependencies: - boa - conda-build - - python>=3.10,<3.13 + - python>=3.10,<=3.13 - numpy>=1.17.0,<2 - pygmo==2.19.6 - pip @@ -25,7 +25,5 @@ dependencies: # for building - twine - wheel - # compiling FMU models from OMPython API - - OMPython # sphinx extensions - -r docs/requirements.txt From f2314ea354a529becdb09c34ea241e0d2d79259b Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Tue, 10 Feb 2026 08:42:23 +0100 Subject: [PATCH 10/17] PIN setup-python pypy3.10 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3c09c3..c79fa12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-python@v6 with: - python-version: 'pypy3.13' + python-version: 'pypy3.10' - run: pip install OMPython - name: compile FMU From b8d66a39675f35db04f08b9cc2189a320271060f Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Tue, 10 Feb 2026 08:46:36 +0100 Subject: [PATCH 11/17] Drop omsimulator install --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c79fa12..819a30e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,6 @@ jobs: version: 'stable' packages: | 'omc' - 'omsimulator' libraries: | 'Modelica 4.0.0' From f44a0fe7846c5ab0c06dbaa149bb8ad1cc413a0d Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Wed, 18 Feb 2026 10:06:13 +0100 Subject: [PATCH 12/17] Drop numpy pin, pin pandas<3 --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 6168e75..3a72c2e 100644 --- a/environment.yml +++ b/environment.yml @@ -4,10 +4,10 @@ dependencies: - boa - conda-build - python>=3.10,<=3.13 - - numpy>=1.17.0,<2 + - numpy - pygmo==2.19.6 - pip - - pandas + - pandas<3 - openpyxl - matplotlib - seaborn From 93e157e9b4c1a226d1fee0e9f9336242b36a5232 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Wed, 18 Feb 2026 12:13:43 +0100 Subject: [PATCH 13/17] Relax pygmo pin --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 3a72c2e..33a509f 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ dependencies: - conda-build - python>=3.10,<=3.13 - numpy - - pygmo==2.19.6 + - pygmo>=2.19.6 - pip - pandas<3 - openpyxl From a7eda4012fbc29b94d77c9d7cd2d2d036d242b80 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Wed, 18 Feb 2026 14:15:45 +0100 Subject: [PATCH 14/17] Drop boa and conda-build --- environment.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/environment.yml b/environment.yml index 33a509f..30b9986 100644 --- a/environment.yml +++ b/environment.yml @@ -1,8 +1,6 @@ channels: - conda-forge dependencies: - - boa - - conda-build - python>=3.10,<=3.13 - numpy - pygmo>=2.19.6 From 355c728abe13f0473e4e1a0c8acd30c11deb31b4 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Tue, 24 Feb 2026 21:58:37 +0100 Subject: [PATCH 15/17] Update pyproject dependencies --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d67b142..033f164 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ classifiers=[ ] keywords=["Biorpocessmodeling", "Parameter estimation", "Functional Mockup Interface"] dependencies = [ - "numpy>=1.26.0,<2", + "numpy>=1.26.0", "fmpy", "scikit-optimize", "scikit-learn", From d3e4e7c867b9c407ca6f2be4763220655b8095f9 Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Tue, 24 Feb 2026 21:58:54 +0100 Subject: [PATCH 16/17] move more deps to pip section in env yaml --- environment.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/environment.yml b/environment.yml index 30b9986..b3e84ad 100644 --- a/environment.yml +++ b/environment.yml @@ -5,16 +5,16 @@ dependencies: - numpy - pygmo>=2.19.6 - pip - - pandas<3 - - openpyxl - - matplotlib - - seaborn - - grpclib - - pytensor - - fmpy - - scikit-learn==1.4.2 - - scikit-optimize - pip: + - pandas<3 + - openpyxl + - matplotlib + - seaborn + - grpclib + - pytensor + - fmpy + - scikit-learn + - scikit-optimize - pytensor-federated # for code testing - pytest From 956823922c6a32e23658fab0b1a17c8122ca6f2f Mon Sep 17 00:00:00 2001 From: "t.latour" Date: Wed, 25 Feb 2026 08:52:32 +0100 Subject: [PATCH 17/17] bump version, pin pandas<3 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 033f164..f5d9ada 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "estim8" -version = "0.1.1" +version = "0.1.2" authors = [ {name = "Tobias Latour", email = "t.latour@fz-juelich.de"}, {name = "Daniel Strohmeier", email = "d.strohmeier@fz-juelich.de"}, @@ -27,7 +27,7 @@ dependencies = [ "scikit-learn", "matplotlib", "seaborn", - "pandas", + "pandas<3", "pytensor-federated", "pytensor", "grpclib",