Merge branch 'main' into equal_ratio_allocation_objective

Deltares · Apr 16, 2024 · 3c1685a · 3c1685a
2 parents 430e8b5 + cd011cb
commit 3c1685a
Show file tree

Hide file tree

Showing 36 changed files with 438 additions and 397 deletions.
diff --git a/.github/workflows/core_testmodels.yml b/.github/workflows/core_testmodels.yml
@@ -33,7 +33,7 @@ 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

diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -33,7 +33,7 @@ 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

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -24,7 +24,7 @@ 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
@@ -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/mypy.yml b/.github/workflows/mypy.yml
@@ -16,7 +16,7 @@ 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

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,7 +16,7 @@ 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

diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -26,7 +26,7 @@ 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

diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml
@@ -22,7 +22,7 @@ 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

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,7 +2,7 @@
 <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_deltares-service-account_access_token%" />
     </parameters>
@@ -23,9 +23,7 @@ pixi run github-release]]></param>
     <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>

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">

diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_PushSuccessfulNightlyBuildToS3.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_PushSuccessfulNightlyBuildToS3.xml
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Windows.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Windows.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="68fc2e9b-b9f2-42f6-b505-5b68e0df151a" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Windows</name>
+  <description>Template for agent that uses Windows OS</description>
+  <settings>
+    <options>
+      <option name="cleanBuild" value="true" />
+    </options>
+    <parameters />
+    <build-runners />
+    <vcs-settings />
+    <requirements>
+      <contains id="RQ_422" name="teamcity.agent.jvm.os.name" value="Windows" />
+    </requirements>
+    <build-triggers />
+    <cleanup />
+  </settings>
+</template>
+
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
@@ -2,12 +2,10 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="cf391998-fed9-4a22-ae44-8877d1028c10" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build libribasim</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
-      <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
     <parameters />
     <build-runners>
@@ -46,9 +44,7 @@ pixi run build-libribasim]]></param>
         <checkout-rule rule=". =&gt; ribasim" />
       </vcs-entry-ref>
     </vcs-settings>
-    <requirements>
-      <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
-    </requirements>
+    <requirements />
     <build-triggers />
     <build-extensions>
       <extension id="BUILD_EXT_295" type="commit-status-publisher">
@@ -63,3 +59,4 @@ pixi run build-libribasim]]></param>
     <cleanup />
   </settings>
 </build-type>
+
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml
@@ -2,10 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="462d0792-8baa-4071-b8e6-90cfafe9495e" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build ribasim_cli</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim\build/ribasim_cli =&gt; ribasim_cli_linux.zip" />
-      <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
     </options>
     <parameters />
@@ -70,3 +69,4 @@ pixi run build-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
+
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml
@@ -2,10 +2,10 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="7bd3078e-0f15-487c-b9d6-dd3417d60fe6" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_api</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim\python\ribasim_api\tests\temp =&gt; test_output.zip" />
-      <option name="cleanBuild" value="true" />
+      <option name="executionTimeoutMin" value="120" />
     </options>
     <parameters>
       <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/libribasim_test_env" />
@@ -74,21 +74,21 @@ pixi run test-ribasim-api]]></param>
       </build-trigger>
     </build-triggers>
     <build-extensions>
-      <extension id="BUILD_EXT_142" type="commit-status-publisher">
-        <parameters>
-          <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:6b37af71-1f2f-4611-8856-db07965445c0" />
-        </parameters>
-      </extension>
       <extension id="BUILD_EXT_145" type="xml-report-plugin">
         <parameters>
           <param name="xmlReportParsing.reportDirs" value="ribasim/report.xml" />
           <param name="xmlReportParsing.reportType" value="junit" />
           <param name="xmlReportParsing.verboseOutput" value="true" />
         </parameters>
       </extension>
+      <extension id="BUILD_EXT_295" type="commit-status-publisher">
+        <parameters>
+          <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:6b37af71-1f2f-4611-8856-db07965445c0" />
+        </parameters>
+      </extension>
     </build-extensions>
     <artifact-dependencies>
       <dependency id="ARTIFACT_DEPENDENCY_570" sourceBuildTypeId="Ribasim_Linux_BuildLibribasim" cleanDestination="true">