Merge main.

Deltares · May 6, 2024 · 547bb54 · 547bb54
2 parents 2a8de52 + 158fd05
commit 547bb54
Show file tree

Hide file tree

Showing 134 changed files with 25,120 additions and 11,670 deletions.
diff --git a/.github/workflows/core_compat_helper.yml b/.github/workflows/core_compat_helper.yml
@@ -15,9 +15,9 @@ jobs:
         run: which julia
         continue-on-error: true
       - name: Install Julia, but only if it is not already available in the PATH
-        uses: julia-actions/setup-julia@v1
+        uses: julia-actions/setup-julia@v2
         with:
-          version: '1'
+          version: "1"
           arch: ${{ runner.arch }}
         if: steps.julia_in_path.outcome != 'success'
       - name: "Add the General registry via Git"
@@ -37,7 +37,10 @@ jobs:
       - name: "Run CompatHelper"
         run: |
           import CompatHelper
-          CompatHelper.main(; subdirs=["core"])
+          CompatHelper.main(;
+              subdirs=["core"],
+              bump_compat_containing_equality_specifier=false,
+          )
         shell: julia --color=yes {0}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/core_testmodels.yml b/.github/workflows/core_testmodels.yml
@@ -29,15 +29,15 @@ jobs:
           - x64
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/cache@v1
+      - uses: julia-actions/cache@v2
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
-          pixi-version: "v0.15.2"
+          pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run install-ci
+        run: pixi run --environment=dev install-ci
       - name: Run testmodels with Ribasim Core
         run: |
           pixi run ribasim-core-testmodels
diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -29,15 +29,15 @@ jobs:
           - x64
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/cache@v1
+      - uses: julia-actions/cache@v2
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run install-ci
+        run: pixi run --environment=dev install-ci
       - name: Test Ribasim Core
         run: |
           pixi run test-ribasim-core-cov

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,15 +20,15 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/cache@v1
+      - uses: julia-actions/cache@v2
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run install-ci
+        run: pixi run --environment=dev install-ci
 
       - name: Check Quarto installation and all engines
         run: pixi run quarto-check
@@ -41,7 +41,7 @@ jobs:
 
       - name: Publish Quarto Project
         if: github.ref == 'refs/heads/main'
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs/_site

diff --git a/.github/workflows/julia_auto_update.yml b/.github/workflows/julia_auto_update.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Update Julia manifest file

diff --git a/.github/workflows/python_lint.yml → .github/workflows/mypy.yml b/.github/workflows/python_lint.yml → .github/workflows/mypy.yml
@@ -1,4 +1,4 @@
-name: Python Lint
+name: Mypy Type Check
 on:
   push:
     branches: [main, update/pixi-lock]
@@ -16,11 +16,11 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run install-ci
+        run: pixi run --environment=dev install-ci
       - name: Run mypy on python/ribasim
         run: |
           pixi run mypy-ribasim-python

diff --git a/.github/workflows/pixi_auto_update.yml b/.github/workflows/pixi_auto_update.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
           cache: false

diff --git a/.github/workflows/python_codegen.yml b/.github/workflows/python_codegen.yml
@@ -16,11 +16,11 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run install-ci
+        run: pixi run --environment=dev install-ci
       - name: Test if codegen runs without errors
         run: pixi run codegen
       - name: Ensure that no code has been generated

diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   test:
-    name: Python ${{ matrix.python-version }} - ${{ matrix.os }}
+    name: ${{ matrix.pixi-environment }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -20,26 +20,19 @@ jobs:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
-        python-version:
-          - "3.10"
-          - "3.11"
-          - "3.12"
+        pixi-environment:
+          - py312
+          - py311
+          - py310
     steps:
       - uses: actions/checkout@v4
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - uses: prefix-dev/[email protected]
         with:
-          python-version: "${{ matrix.python-version }}"
-
-      - name: Install test dependencies
-        run: |
-          pip install --editable "python/ribasim_testmodels"
-          pip install --editable "python/ribasim[tests]"
-
-      - name: Run tests
-        run: pytest --numprocesses=auto --cov=ribasim --cov-report=xml python/ribasim/tests
-
+          pixi-version: "latest"
+      - name: Prepare pixi
+        run: pixi run --environment ${{ matrix.pixi-environment }} install-python
+      - name: Test Ribasim Python
+        run: pixi run --environment ${{ matrix.pixi-environment }} test-ribasim-python-cov
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:

diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml
@@ -22,12 +22,12 @@ jobs:
           - windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.1
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi
         run: |
-          pixi run install-ci
+          pixi run --environment=dev install-ci
       - name: Run tests
         run: pixi run test-ribasim-qgis-cov
       - name: Upload coverage to Codecov

diff --git a/.gitignore b/.gitignore
@@ -10,8 +10,8 @@ docs/build/
 docs/site/
 
 /generated_testmodels
-build/ribasim_cli/
-build/libribasim/
+build/ribasim/
+build/cli/target
 
 JuliaSysimage.dll
 LocalPreferences.toml

diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml b/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml
@@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash
 
 module load pixi
 pixi --version
-pixi run install-ci]]></param>
+pixi run --environment=dev install-ci]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -39,13 +39,10 @@ pixi run generate-testmodels]]></param>
         </parameters>
       </runner>
     </build-runners>
-    <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim">
-        <checkout-rule rule=". =&gt; ribasim" />
-      </vcs-entry-ref>
-    </vcs-settings>
+    <vcs-settings />
     <requirements>
       <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
+      <does-not-equal id="RQ_339" name="teamcity.agent.name" value="Default Agent" />
     </requirements>
     <build-triggers>
       <build-trigger id="TRIGGER_646" type="vcsTrigger">
@@ -59,4 +56,3 @@ pixi run generate-testmodels]]></param>
     <cleanup />
   </settings>
 </build-type>
-
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_GitHubIntegrationTemplate.xml b/.teamcity/Ribasim/buildTypes/Ribasim_GitHubIntegrationTemplate.xml
@@ -6,7 +6,7 @@
     <build-runners />
     <vcs-settings>
       <vcs-entry-ref root-id="Ribasim_Ribasim">
-        <checkout-rule rule="ribasim" />
+        <checkout-rule rule=". =&gt; ribasim" />
       </vcs-entry-ref>
     </vcs-settings>
     <requirements />
@@ -17,7 +17,7 @@
           <param name="github_authentication_type" value="token" />
           <param name="github_host" value="https://api.github.com" />
           <param name="publisherId" value="githubStatusPublisher" />
-          <param name="secure:github_access_token" value="credentialsJSON:558df52e-822f-4d9d-825a-854846a9a2ff" />
+          <param name="secure:github_access_token" value="credentialsJSON:6b37af71-1f2f-4611-8856-db07965445c0" />
           <param name="vcsRootId" value="Ribasim_Ribasim" />
         </parameters>
       </extension>

diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Linux.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Linux.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="1a62a1c8-edfc-4fcf-bd8d-0839b10664a3" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Linux</name>
+  <description>Template for agent that uses Linux OS</description>
+  <settings>
+    <options>
+      <option name="cleanBuild" value="true" />
+      <option name="publishArtifactCondition" value="SUCCESSFUL" />
+    </options>
+    <parameters />
+    <build-runners />
+    <vcs-settings />
+    <requirements>
+      <equals id="RQ_418" name="teamcity.agent.jvm.os.name" value="Linux" />
+    </requirements>
+    <build-triggers />
+    <cleanup />
+  </settings>
+</template>
+
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_BuildPythonWheels.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_BuildPythonWheels.xml