Merge branch 'main' into allow-missing-time

Deltares · Feb 1, 2024 · 054f2ed · 054f2ed
2 parents 473b058 + 70b2348
commit 054f2ed
Show file tree

Hide file tree

Showing 41 changed files with 512 additions and 376 deletions.
diff --git a/.github/workflows/core_compat_helper.yml b/.github/workflows/core_compat_helper.yml
@@ -38,11 +38,8 @@ jobs:
         run: |
           import CompatHelper
           CompatHelper.main(; subdirs=[
+              ".",
               "core",
-              "docs",
-              "build/create_binaries",
-              "build/libribasim",
-              "build/ribasim_cli"
           ])
         shell: julia --color=yes {0}
         env:

diff --git a/.gitignore b/.gitignore
@@ -10,8 +10,8 @@ docs/build/
 docs/site/
 
 /generated_testmodels
-build/create_binaries/ribasim_cli/
-build/create_binaries/libribasim/
+build/ribasim_cli/
+build/libribasim/
 
 JuliaSysimage.dll
 LocalPreferences.toml
@@ -147,7 +147,7 @@ dmypy.json
 .pyre/
 
 /.luarc.json
-build/ribasim_cli/tests/temp/
+build/tests/temp/
 python/ribasim_api/tests/temp/
 report.xml
 /utils/juliaup

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
         exclude: '.teamcity'
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.9
+    rev: v0.1.15
     hooks:
       - id: ruff
         types_or: [python, pyi, jupyter]
@@ -26,6 +26,6 @@ repos:
     hooks:
       - id: nbstripout
   - repo: https://github.com/crate-ci/typos
-    rev: v1.16.26
+    rev: v1.17.2
     hooks:
       - id: typos
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
@@ -4,7 +4,7 @@
   <description />
   <settings>
     <options>
-      <option name="artifactRules" value="ribasim\build\create_binaries\libribasim =&gt; libribasim.zip" />
+      <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" />
@@ -49,31 +49,7 @@ pixi run build-libribasim]]></param>
     <requirements>
       <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
     </requirements>
-    <build-triggers>
-      <build-trigger id="TRIGGER_497" type="schedulingTrigger">
-        <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
-          <param name="cronExpression_dm" value="*" />
-          <param name="cronExpression_dw" value="?" />
-          <param name="cronExpression_hour" value="*" />
-          <param name="cronExpression_min" value="0" />
-          <param name="cronExpression_month" value="*" />
-          <param name="cronExpression_sec" value="0" />
-          <param name="cronExpression_year" value="*" />
-          <param name="dayOfWeek" value="Sunday" />
-          <param name="enableQueueOptimization" value="true" />
-          <param name="hour" value="3" />
-          <param name="minute" value="0" />
-          <param name="promoteWatchedBuild" value="true" />
-          <param name="revisionRule" value="lastFinished" />
-          <param name="revisionRuleBuildBranch" value="+:&lt;default&gt;" />
-          <param name="schedulingPolicy" value="daily" />
-          <param name="timezone" value="SERVER" />
-          <param name="triggerBuildWithPendingChangesOnly" value="true" />
-        </parameters>
-      </build-trigger>
-    </build-triggers>
+    <build-triggers />
     <build-extensions>
       <extension id="BUILD_EXT_295" type="commit-status-publisher">
         <parameters>

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml
@@ -4,7 +4,7 @@
   <description />
   <settings>
     <options>
-      <option name="artifactRules" value="ribasim\build/create_binaries/ribasim_cli =&gt; ribasim_cli_linux.zip" />
+      <option name="artifactRules" value="ribasim\build/ribasim_cli =&gt; ribasim_cli_linux.zip" />
       <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
     </options>
@@ -42,7 +42,7 @@ pixi run build-ribasim-cli]]></param>
       <runner id="RUNNER_1932" name="Get version from Ribasim" type="simpleRunner">
         <parameters>
           <param name="script.content" value="./ribasim --version" />
-          <param name="teamcity.build.workingDir" value="ribasim/build/create_binaries/ribasim_cli/bin" />
+          <param name="teamcity.build.workingDir" value="ribasim/build/ribasim_cli/bin" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
         </parameters>
@@ -56,31 +56,7 @@ pixi run build-ribasim-cli]]></param>
     <requirements>
       <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
     </requirements>
-    <build-triggers>
-      <build-trigger id="TRIGGER_497" type="schedulingTrigger">
-        <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
-          <param name="cronExpression_dm" value="*" />
-          <param name="cronExpression_dw" value="?" />
-          <param name="cronExpression_hour" value="*" />
-          <param name="cronExpression_min" value="0" />
-          <param name="cronExpression_month" value="*" />
-          <param name="cronExpression_sec" value="0" />
-          <param name="cronExpression_year" value="*" />
-          <param name="dayOfWeek" value="Sunday" />
-          <param name="enableQueueOptimization" value="true" />
-          <param name="hour" value="3" />
-          <param name="minute" value="0" />
-          <param name="promoteWatchedBuild" value="true" />
-          <param name="revisionRule" value="lastFinished" />
-          <param name="revisionRuleBuildBranch" value="+:&lt;default&gt;" />
-          <param name="schedulingPolicy" value="daily" />
-          <param name="timezone" value="SERVER" />
-          <param name="triggerBuildWithPendingChangesOnly" value="true" />
-        </parameters>
-      </build-trigger>
-    </build-triggers>
+    <build-triggers />
     <build-extensions>
       <extension id="BUILD_EXT_295" type="commit-status-publisher">
         <parameters>

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml
@@ -49,11 +49,27 @@ pixi run test-ribasim-api]]></param>
       <does-not-equal id="RQ_315" name="env.OS" value="Windows_NT" />
     </requirements>
     <build-triggers>
-      <build-trigger id="TRIGGER_64" type="buildDependencyTrigger">
+      <build-trigger id="TRIGGER_642" type="schedulingTrigger">
         <parameters>
-          <param name="afterSuccessfulBuildOnly" value="true" />
-          <param name="branchFilter" value="+:&lt;default&gt;" />
-          <param name="dependsOn" value="Ribasim_Linux_BuildLibribasim" />
+          <param name="branchFilter"><![CDATA[+:<default>
++:v*]]></param>
+          <param name="cronExpression_dm" value="*" />
+          <param name="cronExpression_dw" value="?" />
+          <param name="cronExpression_hour" value="*" />
+          <param name="cronExpression_min" value="0" />
+          <param name="cronExpression_month" value="*" />
+          <param name="cronExpression_sec" value="0" />
+          <param name="cronExpression_year" value="*" />
+          <param name="dayOfWeek" value="Sunday" />
+          <param name="enableQueueOptimization" value="true" />
+          <param name="hour" value="3" />
+          <param name="minute" value="0" />
+          <param name="promoteWatchedBuild" value="true" />
+          <param name="revisionRule" value="lastFinished" />
+          <param name="revisionRuleBuildBranch" value="+:&lt;default&gt;" />
+          <param name="schedulingPolicy" value="daily" />
+          <param name="timezone" value="SERVER" />
+          <param name="triggerBuildWithPendingChangesOnly" value="true" />
         </parameters>
       </build-trigger>
     </build-triggers>
@@ -76,10 +92,19 @@ pixi run test-ribasim-api]]></param>
     </build-extensions>
     <artifact-dependencies>
       <dependency id="ARTIFACT_DEPENDENCY_570" sourceBuildTypeId="Ribasim_Linux_BuildLibribasim" cleanDestination="true">
-        <revisionRule name="lastSuccessful" revision="latest.lastSuccessful" branch="+:&lt;default&gt;&#xD;&#xA;+:ref" />
-        <artifact sourcePath="libribasim.zip!** =&gt; ribasim/build/create_binaries/libribasim&#xD;&#xA;" />
+        <revisionRule name="sameChainOrLastFinished" revision="latest.sameChainOrLastFinished" />
+        <artifact sourcePath="libribasim.zip!** =&gt; ribasim/build/libribasim&#xD;&#xA;" />
       </dependency>
     </artifact-dependencies>
+    <dependencies>
+      <depend-on sourceBuildTypeId="Ribasim_Linux_BuildLibribasim">
+        <options>
+          <option name="run-build-if-dependency-failed" value="RUN_ADD_PROBLEM" />
+          <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>

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml
@@ -4,7 +4,7 @@
   <description />
   <settings>
     <options>
-      <option name="artifactRules" value="ribasim\build\ribasim_cli\tests\temp =&gt; test_output.zip" />
+      <option name="artifactRules" value="ribasim\build\tests\temp =&gt; test_output.zip" />
       <option name="cleanBuild" value="true" />
     </options>
     <parameters>
@@ -49,11 +49,27 @@ pixi run test-ribasim-cli]]></param>
       <does-not-equal id="RQ_310" name="env.OS" value="Windows_NT" />
     </requirements>
     <build-triggers>
-      <build-trigger id="TRIGGER_64" type="buildDependencyTrigger">
+      <build-trigger id="TRIGGER_645" type="schedulingTrigger">
         <parameters>
-          <param name="afterSuccessfulBuildOnly" value="true" />
-          <param name="branchFilter" value="+:&lt;default&gt;" />
-          <param name="dependsOn" value="Ribasim_Linux_BuildRibasimCli" />
+          <param name="branchFilter"><![CDATA[+:<default>
++:v*]]></param>
+          <param name="cronExpression_dm" value="*" />
+          <param name="cronExpression_dw" value="?" />
+          <param name="cronExpression_hour" value="*" />
+          <param name="cronExpression_min" value="0" />
+          <param name="cronExpression_month" value="*" />
+          <param name="cronExpression_sec" value="0" />
+          <param name="cronExpression_year" value="*" />
+          <param name="dayOfWeek" value="Sunday" />
+          <param name="enableQueueOptimization" value="true" />
+          <param name="hour" value="3" />
+          <param name="minute" value="0" />
+          <param name="promoteWatchedBuild" value="true" />
+          <param name="revisionRule" value="lastFinished" />
+          <param name="revisionRuleBuildBranch" value="+:&lt;default&gt;" />
+          <param name="schedulingPolicy" value="daily" />
+          <param name="timezone" value="SERVER" />
+          <param name="triggerBuildWithPendingChangesOnly" value="true" />
         </parameters>
       </build-trigger>
     </build-triggers>
@@ -76,10 +92,19 @@ pixi run test-ribasim-cli]]></param>
     </build-extensions>
     <artifact-dependencies>
       <dependency id="ARTIFACT_DEPENDENCY_570" sourceBuildTypeId="Ribasim_Linux_BuildRibasimCli" cleanDestination="true">
-        <revisionRule name="lastSuccessful" revision="latest.lastSuccessful" />
-        <artifact sourcePath="ribasim_cli_linux.zip!** =&gt; ribasim/build/create_binaries/ribasim_cli&#xD;&#xA;" />
+        <revisionRule name="sameChainOrLastFinished" revision="latest.sameChainOrLastFinished" />
+        <artifact sourcePath="ribasim_cli_linux.zip!** =&gt; ribasim/build/ribasim_cli&#xD;&#xA;" />
       </dependency>
     </artifact-dependencies>
+    <dependencies>
+      <depend-on sourceBuildTypeId="Ribasim_Linux_BuildRibasimCli">
+        <options>
+          <option name="run-build-if-dependency-failed" value="RUN_ADD_PROBLEM" />
+          <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>

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml
@@ -4,7 +4,7 @@
   <description />
   <settings>
     <options>
-      <option name="artifactRules" value="ribasim\build\create_binaries\libribasim =&gt; libribasim.zip" />
+      <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" />
@@ -37,31 +37,7 @@ pixi run build-libribasim]]></param>
     <requirements>
       <equals id="RQ_275" name="env.OS" value="Windows_NT" />
     </requirements>
-    <build-triggers>
-      <build-trigger id="TRIGGER_497" type="schedulingTrigger">
-        <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
-          <param name="cronExpression_dm" value="*" />
-          <param name="cronExpression_dw" value="?" />
-          <param name="cronExpression_hour" value="*" />
-          <param name="cronExpression_min" value="0" />
-          <param name="cronExpression_month" value="*" />
-          <param name="cronExpression_sec" value="0" />
-          <param name="cronExpression_year" value="*" />
-          <param name="dayOfWeek" value="Sunday" />
-          <param name="enableQueueOptimization" value="true" />
-          <param name="hour" value="3" />
-          <param name="minute" value="0" />
-          <param name="promoteWatchedBuild" value="true" />
-          <param name="revisionRule" value="lastFinished" />
-          <param name="revisionRuleBuildBranch" value="+:&lt;default&gt;" />
-          <param name="schedulingPolicy" value="daily" />
-          <param name="timezone" value="SERVER" />
-          <param name="triggerBuildWithPendingChangesOnly" value="true" />
-        </parameters>
-      </build-trigger>
-    </build-triggers>
+    <build-triggers />
     <build-extensions>
       <extension id="BUILD_EXT_295" type="commit-status-publisher">
         <parameters>

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml
@@ -4,7 +4,7 @@
   <description />
   <settings>
     <options>
-      <option name="artifactRules" value="ribasim\build/create_binaries/ribasim_cli =&gt; ribasim_cli_windows.zip" />
+      <option name="artifactRules" value="ribasim\build/ribasim_cli =&gt; ribasim_cli_windows.zip" />
       <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
     </options>
@@ -30,7 +30,7 @@ pixi run build-ribasim-cli]]></param>
       <runner id="RUNNER_1932" name="Get version from Ribasim" type="simpleRunner">
         <parameters>
           <param name="script.content" value="ribasim --version" />
-          <param name="teamcity.build.workingDir" value="ribasim/build/create_binaries/ribasim_cli" />
+          <param name="teamcity.build.workingDir" value="ribasim/build/ribasim_cli" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
         </parameters>
@@ -44,31 +44,7 @@ pixi run build-ribasim-cli]]></param>
     <requirements>
       <equals id="RQ_275" name="env.OS" value="Windows_NT" />
     </requirements>
-    <build-triggers>
-      <build-trigger id="TRIGGER_497" type="schedulingTrigger">
-        <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
-          <param name="cronExpression_dm" value="*" />
-          <param name="cronExpression_dw" value="?" />
-          <param name="cronExpression_hour" value="*" />
-          <param name="cronExpression_min" value="0" />
-          <param name="cronExpression_month" value="*" />
-          <param name="cronExpression_sec" value="0" />
-          <param name="cronExpression_year" value="*" />
-          <param name="dayOfWeek" value="Sunday" />
-          <param name="enableQueueOptimization" value="true" />
-          <param name="hour" value="3" />
-          <param name="minute" value="0" />
-          <param name="promoteWatchedBuild" value="true" />
-          <param name="revisionRule" value="lastFinished" />
-          <param name="revisionRuleBuildBranch" value="+:&lt;default&gt;" />
-          <param name="schedulingPolicy" value="daily" />
-          <param name="timezone" value="SERVER" />
-          <param name="triggerBuildWithPendingChangesOnly" value="true" />
-        </parameters>
-      </build-trigger>
-    </build-triggers>
+    <build-triggers />
     <build-extensions>
       <extension id="BUILD_EXT_295" type="commit-status-publisher">
         <parameters>