Merge main.

Deltares · Apr 18, 2024 · c0798a0 · c0798a0
2 parents b9658e4 + f7039b8
commit c0798a0
Show file tree

Hide file tree

Showing 114 changed files with 26,121 additions and 28,725 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
@@ -33,11 +33,11 @@ jobs:
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].2
         with:
           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
@@ -33,11 +33,11 @@ jobs:
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].2
         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
@@ -24,11 +24,11 @@ jobs:
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].2
         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/[email protected].1
+      - uses: prefix-dev/[email protected].2
         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/[email protected].1
+      - uses: prefix-dev/[email protected].2
         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/[email protected].1
+      - uses: prefix-dev/[email protected].2
         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/[email protected].1
+      - uses: prefix-dev/[email protected].2
         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
@@ -26,11 +26,11 @@ jobs:
           - py310
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].2
         with:
           pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run --environment ${{ matrix.pixi-environment }} install-ci
+        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

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/[email protected].1
+      - uses: prefix-dev/[email protected].2
         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/.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
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml
@@ -2,9 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="5fa3a42d-6a7b-4820-95c1-c550d6648ae7" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Make GitHub Release</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <parameters>
-      <param name="env.GITHUB_TOKEN" value="%github_teamcity-deltares_public_access_token%" />
+      <param name="env.GITHUB_TOKEN" value="%github_deltares-service-account_access_token%" />
     </parameters>
     <build-runners>
       <runner id="RUNNER_2523" name="Push release to GitHub" type="simpleRunner">
@@ -14,8 +14,7 @@ set -euxo pipefail
 . /usr/share/Modules/init/bash
 
 module load pixi
-pixi run github-release
-]]></param>
+pixi run github-release]]></param>
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
         </parameters>
@@ -24,9 +23,7 @@ pixi run github-release
     <vcs-settings>
       <vcs-entry-ref root-id="Ribasim_Ribasim" />
     </vcs-settings>
-    <requirements>
-      <equals id="RQ_294" name="teamcity.agent.jvm.os.name" value="Linux" />
-    </requirements>
+    <requirements />
     <build-triggers>
       <build-trigger id="TRIGGER_637" type="vcsTrigger">
         <parameters>
@@ -112,3 +109,4 @@ pixi run github-release
     </cleanup>
   </settings>
 </build-type>
+
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
@@ -2,10 +2,13 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="7a4efefb-e910-456d-bab2-fb807d5ad0f9" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Make QGIS plugin</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim_qgis.zip" />
     </options>
+    <disabled-settings>
+      <setting-ref ref="RQ_338" />
+    </disabled-settings>
     <parameters />
     <build-runners>
       <runner id="RUNNER_2193" name="" type="simpleRunner">
@@ -34,16 +37,6 @@ zip -r ribasim_qgis.zip ribasim_qgis]]></param>
         </parameters>
       </build-trigger>
     </build-triggers>
-    <dependencies>
-      <depend-on sourceBuildTypeId="Ribasim_Windows_BuildRibasimCli">
-        <options>
-          <option name="run-build-if-dependency-failed" value="CANCEL" />
-          <option name="run-build-if-dependency-failed-to-start" value="CANCEL" />
-          <option name="take-started-build-with-same-revisions" value="true" />
-          <option name="take-successful-builds-only" value="true" />
-        </options>
-      </depend-on>
-    </dependencies>
     <cleanup />
   </settings>
 </build-type>