Merge branch 'main' into equal_ratio_allocation_objective

Deltares · Apr 22, 2024 · 2bf7834 · 2bf7834
2 parents 76bc0f5 + e3bf329
commit 2bf7834
Show file tree

Hide file tree

Showing 58 changed files with 1,032 additions and 1,390 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/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         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/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         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/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

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.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         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/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         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/setup-pixi@v0.5.2
+      - 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,7 +16,7 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         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/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         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/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml
@@ -27,7 +27,8 @@ pixi run github-release]]></param>
     <build-triggers>
       <build-trigger id="TRIGGER_637" type="vcsTrigger">
         <parameters>
-          <param name="branchFilter" value="+:v20*" />
+          <param name="branchFilter"><![CDATA[+:v20*
++:release*]]></param>
           <param name="enableQueueOptimization" value="true" />
           <param name="quietPeriodMode" value="DO_NOT_USE" />
         </parameters>

diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
@@ -27,16 +27,6 @@ zip -r ribasim_qgis.zip ribasim_qgis]]></param>
     <requirements>
       <does-not-equal id="RQ_338" name="env.OS" value="Windows_NT" />
     </requirements>
-    <build-triggers>
-      <build-trigger id="TRIGGER_550" type="buildDependencyTrigger">
-        <parameters>
-          <param name="afterSuccessfulBuildOnly" value="true" />
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
-          <param name="dependsOn" value="Ribasim_Windows_BuildRibasimCli" />
-        </parameters>
-      </build-trigger>
-    </build-triggers>
     <cleanup />
   </settings>
 </build-type>

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml
@@ -51,8 +51,7 @@ pixi run test-ribasim-api]]></param>
     <build-triggers>
       <build-trigger id="TRIGGER_642" type="schedulingTrigger">
         <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
+          <param name="branchFilter"><![CDATA[+:<default>]]></param>
           <param name="cronExpression_dm" value="*" />
           <param name="cronExpression_dw" value="?" />
           <param name="cronExpression_hour" value="*" />

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml
@@ -51,8 +51,7 @@ pixi run test-ribasim-cli]]></param>
     <build-triggers>
       <build-trigger id="TRIGGER_645" type="schedulingTrigger">
         <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
+          <param name="branchFilter"><![CDATA[+:<default>]]></param>
           <param name="cronExpression_dm" value="*" />
           <param name="cronExpression_dw" value="?" />
           <param name="cronExpression_hour" value="*" />

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml
@@ -38,8 +38,7 @@
     <build-triggers>
       <build-trigger id="TRIGGER_631" type="schedulingTrigger">
         <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
+          <param name="branchFilter"><![CDATA[+:<default>]]></param>
           <param name="cronExpression_dm" value="*" />
           <param name="cronExpression_dw" value="?" />
           <param name="cronExpression_hour" value="*" />

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml
@@ -38,8 +38,7 @@
     <build-triggers>
       <build-trigger id="TRIGGER_636" type="schedulingTrigger">
         <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
+          <param name="branchFilter"><![CDATA[+:<default>]]></param>
           <param name="cronExpression_dm" value="*" />
           <param name="cronExpression_dw" value="?" />
           <param name="cronExpression_hour" value="*" />

diff --git a/Manifest.toml b/Manifest.toml
@@ -1262,7 +1262,7 @@ version = "3.5.14"
 deps = ["Accessors", "Arrow", "BasicModelInterface", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "EnumX", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "LinearSolve", "Logging", "LoggingExtras", "MetaGraphsNext", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimeZones", "TimerOutputs", "TranscodingStreams"]
 path = "core"
 uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635"
-version = "2024.6.1"
+version = "2024.7.0"
 
 [[deps.RuntimeGeneratedFunctions]]
 deps = ["ExprTools", "SHA", "Serialization"]

diff --git a/core/Project.toml b/core/Project.toml
@@ -2,7 +2,7 @@ name = "Ribasim"
 uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635"
 authors = ["Deltares and contributors <[email protected]>"]
 manifest = "../Manifest.toml"
-version = "2024.6.1"
+version = "2024.7.0"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"