Merge branch 'main' into split_vertical_fluxes

.github/workflows/core_testmodels.yml

@@ -37,7 +37,7 @@ jobs:
         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

.github/workflows/core_tests.yml

@@ -37,7 +37,7 @@ jobs:
         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

.github/workflows/docs.yml

@@ -28,7 +28,7 @@ jobs:
         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

.github/workflows/python_codegen.yml

@@ -20,7 +20,7 @@ jobs:
         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

.github/workflows/python_lint.yml

@@ -20,7 +20,7 @@ jobs:
         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

.github/workflows/python_tests.yml

@@ -30,7 +30,7 @@ jobs:
         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

.github/workflows/qgis.yml

@@ -27,7 +27,7 @@ jobs:
           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

.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" />
@@ -56,4 +56,3 @@ pixi run generate-testmodels]]></param>
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.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" />
@@ -63,4 +63,3 @@ pixi run build-libribasim]]></param>
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml

@@ -18,7 +18,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" />
@@ -70,4 +70,3 @@ pixi run build-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.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" />
@@ -108,4 +108,3 @@ pixi run test-ribasim-api]]></param>
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.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" />
@@ -108,4 +108,3 @@ pixi run test-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml

@@ -14,7 +14,7 @@
       <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
         <parameters>
           <param name="script.content"><![CDATA[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" />
@@ -52,4 +52,3 @@ pixi run build-libribasim]]></param>
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml

@@ -12,7 +12,7 @@
     <build-runners>
       <runner id="RUNNER_2418" name="Set up pixi" type="simpleRunner">
         <parameters>
-          <param name="script.content" value="pixi run install-ci" />
+          <param name="script.content" value="pixi run --environment=dev install-ci" />
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -58,4 +58,3 @@ pixi run build-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml

@@ -13,7 +13,7 @@
     <build-runners>
       <runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
         <parameters>
-          <param name="script.content" value="pixi run install-ci" />
+          <param name="script.content" value="pixi run --environment=dev install-ci" />
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -97,4 +97,3 @@
     <cleanup />
   </settings>
 </build-type>
-

.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml

@@ -13,7 +13,7 @@
     <build-runners>
       <runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
         <parameters>
-          <param name="script.content" value="pixi run install-ci" />
+          <param name="script.content" value="pixi run --environment=dev install-ci" />
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -97,4 +97,3 @@
     <cleanup />
   </settings>
 </build-type>
-

Manifest.toml

@@ -1247,7 +1247,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.5.0"
+version = "2024.6.0"
 
 [[deps.RuntimeGeneratedFunctions]]
 deps = ["ExprTools", "SHA", "Serialization"]

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.5.0"
+version = "2024.6.0"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

core/test/data/config_test.toml

@@ -2,7 +2,7 @@ starttime = 2019-01-01
 endtime = 2019-12-31
 input_dir = "../../generated_testmodels/lhm"
 results_dir = "../../generated_testmodels/lhm"
-ribasim_version = "2024.5.0"
+ribasim_version = "2024.6.0"
 
 [basin]
 time = "basin/time.arrow"

core/test/data/logging_test_loglevel_debug.toml

@@ -2,7 +2,7 @@ starttime = 2019-01-01
 endtime = 2019-12-31
 input_dir = "."
 results_dir = "results"
-ribasim_version = "2024.5.0"
+ribasim_version = "2024.6.0"
 
 [logging]
 verbosity = "debug"

core/test/data/logging_test_no_loglevel.toml

@@ -2,4 +2,4 @@ starttime = 2019-01-01
 endtime = 2019-12-31
 input_dir = "."
 results_dir = "results"
-ribasim_version = "2024.5.0"
+ribasim_version = "2024.6.0"

core/test/docs.toml

@@ -7,7 +7,7 @@ endtime = 2021-01-01   # required
 input_dir = "."         # required
 results_dir = "results" # required
 
-ribasim_version = "2024.5.0" # required
+ribasim_version = "2024.6.0" # required
 
 # Specific tables can also go into Arrow files rather than the database.
 # For large tables this can benefit from better compressed file sizes.

docs/contribute/index.qmd

@@ -35,7 +35,7 @@ First, set up pixi as described on their getting started [page](https://prefix.d
 Then set up the environment by running the following commands:
 
 ```sh
-pixi run install
+pixi run --environment=dev install
 ```
 
 This will automatically install all required packages for development.

docs/contribute/qgis.qmd

@@ -5,7 +5,7 @@ title: "QGIS plugin development"
 # Set up the developer environment
 
 After you have installed the environment as described [here](index.qmd) you must still activate the QGIS plugins.
-The simplest way to do this is by running `pixi run install-qgis-plugins`.
+The simplest way to do this is by running `pixi run --environment=dev install-qgis-plugins`.
 It grabs the latest version of the iMOD QGIS plugin and it makes a symlink to the ribasim_qgis folder so that QGIS can find it.
 It also installs plugins that make it possible to reload and debug your plugin while QGIS is open.
 
@@ -36,7 +36,7 @@ Then simply call `pixi run test-ribasim-qgis`.
 
 # Debugging
 
-After installing the plugins via `pixi run install-qgis-plugins`.
+After installing the plugins via `pixi run --environment=dev install-qgis-plugins`.
 Extra debugging tools are also installed in QGIS that is installed within your pixi environment.
 
 After you have started `pixi run qgis`, you can make alterations to the Python code and use the [Plugin Reloader](https://github.com/borysiasty/plugin_reloader) to reload the plugin without restarting QGIS.

open-vscode.bat

@@ -1 +1 @@
-pixi run code . | exit
+pixi run --environment=dev code . | exit