Merge branch 'main' into equal_ratio_allocation_objective

Deltares · May 21, 2024 · c758003 · c758003
2 parents e21fbc6 + 224c460
commit c758003
Show file tree

Hide file tree

Showing 83 changed files with 13,639 additions and 10,394 deletions.
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.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run --environment=dev install-ci
+        run: pixi run 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,13 @@ 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.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
-      - name: Prepare pixi
-        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,22 +20,19 @@ 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.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi
-        run: pixi run --environment=dev install-ci
+        run: pixi run install-ci
 
       - name: Check Quarto installation and all engines
         run: pixi run quarto-check
 
-      - name: Generate Julia docs
-        run: pixi run build-julia-docs
-
       - name: Render Quarto Project
         run: pixi run quarto-render
 

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.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
       - name: Update Julia manifest file

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -16,11 +16,9 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
-      - name: Prepare pixi
-        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.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
           cache: false

diff --git a/.github/workflows/python_codegen.yml b/.github/workflows/python_codegen.yml
@@ -16,11 +16,9 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
-      - name: Prepare pixi
-        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
@@ -26,11 +26,9 @@ jobs:
           - py310
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           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

diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml
@@ -22,12 +22,9 @@ jobs:
           - windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.6.0
+      - uses: prefix-dev/setup-pixi@v0.7.0
         with:
           pixi-version: "latest"
-      - name: Prepare pixi
-        run: |
-          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
@@ -5,10 +5,6 @@
 # Files generated by invoking Julia with --track-allocation
 *.jl.mem
 
-# Build artifacts for creating documentation generated by the Documenter package
-docs/build/
-docs/site/
-
 /generated_testmodels
 build/ribasim/
 build/cli/target

diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml b/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml
@@ -18,8 +18,7 @@
 source /usr/share/Modules/init/bash
 
 module load pixi
-pixi --version
-pixi run --environment=dev install-ci]]></param>
+pixi --version]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -56,3 +55,4 @@ pixi run generate-testmodels]]></param>
     <cleanup />
   </settings>
 </build-type>
+
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasim.xml
@@ -17,7 +17,7 @@ source /usr/share/Modules/init/bash
 
 module load pixi
 pixi --version
-pixi run --environment=dev install-ci]]></param>
+pixi run install-ci]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml
@@ -16,8 +16,7 @@
 source /usr/share/Modules/init/bash
 
 module load pixi
-pixi --version
-pixi run install-python]]></param>
+pixi --version]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -30,7 +29,7 @@ pixi run install-python]]></param>
 source /usr/share/Modules/init/bash
 
 module load pixi
-pixi run --environment=dev install
+pixi run install
 pixi run test-ribasim-api
 pixi run test-ribasim-cli]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml
@@ -16,7 +16,7 @@
       <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
         <parameters>
           <param name="script.content"><![CDATA[pixi --version
-pixi run --environment=dev install-ci]]></param>
+pixi run install-ci]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestDelwaqCoupling.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestDelwaqCoupling.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="3da7414a-6ac5-41db-b5bc-d2a8bb887362" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Test Delwaq coupling</name>
+  <description />
+  <settings ref="Ribasim_Windows">
+    <options>
+      <option name="artifactRules" value="ribasim/coupling/delwaq/model" />
+    </options>
+    <parameters />
+    <build-runners>
+      <runner id="Set_up_pixi" name="Set up pixi" type="simpleRunner">
+        <parameters>
+          <param name="script.content" value="pixi --version" />
+          <param name="teamcity.build.workingDir" value="ribasim" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Run_Delwaq" name="Run Delwaq" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[pixi install
+pixi run ribasim-core-testmodels basic
+set D3D_HOME=%teamcity.build.checkoutDir%/dimr
+pixi run delwaq]]></param>
+          <param name="teamcity.build.workingDir" value="ribasim" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+    </build-runners>
+    <vcs-settings>
+      <vcs-entry-ref root-id="Ribasim_Ribasim">
+        <checkout-rule rule=". =&gt; ribasim" />
+      </vcs-entry-ref>
+    </vcs-settings>
+    <requirements />
+    <build-triggers>
+      <build-trigger id="TRIGGER_304" type="vcsTrigger">
+        <parameters>
+          <param name="branchFilter" value="+:*" />
+          <param name="enableQueueOptimization" value="true" />
+          <param name="quietPeriodMode" value="DO_NOT_USE" />
+          <param name="triggerRules" value="+:coupling/delwaq/**" />
+        </parameters>
+      </build-trigger>
+    </build-triggers>
+    <build-extensions>
+      <extension id="BUILD_EXT_417" 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:abf605ce-e382-4b10-b5de-8a7640dc58d9" />
+          <param name="vcsRootId" value="Ribasim_Ribasim" />
+        </parameters>
+      </extension>
+    </build-extensions>
+    <artifact-dependencies>
+      <dependency id="ARTIFACT_DEPENDENCY_4206" sourceBuildTypeId="Dimr_DimrCollectors_2bDimrCollectorReleaseSigned" cleanDestination="false">
+        <revisionRule name="lastPinned" revision="latest.lastPinned" />
+        <artifact sourcePath="dimrset_x64_signed_272.zip!/x64 =&gt; dimr" />
+      </dependency>
+    </artifact-dependencies>
+    <cleanup />
+  </settings>
+</build-type>
+
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml
@@ -10,15 +10,15 @@
     <build-runners>
       <runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
         <parameters>
-          <param name="script.content" value="pixi run install-python" />
+          <param name="script.content" value="pixi --version" />
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
         </parameters>
       </runner>
       <runner id="RUNNER_1503" name="Run tests" type="simpleRunner">
         <parameters>
-          <param name="script.content"><![CDATA[pixi run --environment=dev install
+          <param name="script.content"><![CDATA[pixi run install
 pixi run test-ribasim-api
 pixi run test-ribasim-cli]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />