Bump version number (#2572)

visr · web-flow · commit e85e80d722da · 2025-09-09T23:24:12.000+02:00
In preparation for release 2025.5.0. Also updates the QGIS plugin manual test plan, and removes some multithreading that may not be safe, see #2549 (comment).
diff --git a/Manifest.toml b/Manifest.toml
diff --git a/Ribasim-python.spdx.json b/Ribasim-python.spdx.json
diff --git a/build/cli/Cargo.lock b/build/cli/Cargo.lock
diff --git a/build/cli/Cargo.toml b/build/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ribasim"
-version = "2025.4.0"
+version = "2025.5.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
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 <ribasim.info@deltares.nl>"]
 manifest = "../Manifest.toml"
-version = "2025.4.0"
+version = "2025.5.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
diff --git a/core/src/solve.jl b/core/src/solve.jl
@@ -102,7 +102,7 @@ end
 function formulate_continuous_control!(du::CVector, p::Parameters, t::Number)::Nothing
     (; compound_variable, target_ref, func) = p.p_independent.continuous_control
 
-    @threads for i in eachindex(compound_variable)
+    for i in eachindex(compound_variable)
         cvar = compound_variable[i]
         ref = target_ref[i]
         func_ = func[i]
@@ -473,7 +473,7 @@ function formulate_flow!(
     (; p_mutable) = p
     all_nodes_active = p_mutable.all_nodes_active
     (; node_id, active) = tabulated_rating_curve
-    @threads for id in node_id
+    for id in node_id
         inflow_link = tabulated_rating_curve.inflow_link[id.idx]
         outflow_link = tabulated_rating_curve.outflow_link[id.idx]
         inflow_id = inflow_link.link[1]
diff --git a/core/test/data/config_test.toml b/core/test/data/config_test.toml
@@ -3,7 +3,7 @@ endtime = 2019-12-31
 crs = "EPSG:28992"
 input_dir = "."
 results_dir = "results"
-ribasim_version = "2025.4.0"
+ribasim_version = "2025.5.0"
 
 [basin]
 time = "basin/time.arrow"
diff --git a/core/test/data/logging_test_loglevel_debug.toml b/core/test/data/logging_test_loglevel_debug.toml
@@ -3,7 +3,7 @@ endtime = 2019-12-31
 crs = "EPSG:28992"
 input_dir = "."
 results_dir = "results"
-ribasim_version = "2025.4.0"
+ribasim_version = "2025.5.0"
 
 [logging]
 verbosity = "debug"
diff --git a/core/test/data/logging_test_no_loglevel.toml b/core/test/data/logging_test_no_loglevel.toml
@@ -3,4 +3,4 @@ endtime = 2019-12-31
 crs = "EPSG:28992"
 input_dir = "."
 results_dir = "results"
-ribasim_version = "2025.4.0"
+ribasim_version = "2025.5.0"
diff --git a/core/test/docs.toml b/core/test/docs.toml
@@ -12,7 +12,7 @@ crs = "EPSG:4326"      # required
 input_dir = "."         # required
 results_dir = "results" # required
 
-ribasim_version = "2025.4.0" # required
+ribasim_version = "2025.5.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.
diff --git a/docs/dev/qgis_test_plan.qmd b/docs/dev/qgis_test_plan.qmd
@@ -22,106 +22,32 @@ Before starting with data, perform the following tests to see if the plugin does
 - Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
 - Press the Ribasim button on the QGIS toolbar: _Ribasim panel hides_.
 
-## Button states on startup
-
-- Open QGIS and ensure that the Ribasim plugin is installed and enabled.
-- Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
-- _In the Nodes tab, all buttons are disabled_.
-
-❌ [Failing](https://github.com/Deltares/Ribasim/issues/1678)
-
 # Model tab button interaction tests
 
 ## Open model twice
 
 - Open QGIS and ensure that the Ribasim plugin is installed and enabled.
 - Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
-- Press the "New" button in the Model tab: _file navigation window pops up_.
-- Fill in a name ("test1").
-- Press OK: _A TOML and database file are created on the given location_.
-- Press the "Open" button in the Model tab: _file navigation window pops up_.
-- Open test1.toml: _A new layer group is added to the layers panel_.
-- In the Nodes tab press "Basin / profile": _A Basin / profile table layer is added to the last layer group only_.
+- Press the "Open" button in the Ribasim panel: _file navigation window pops up_.
+- Choose an existing model from the `generated_testmodels` folder.
+- Press OK: _The model layers appear in the layer panel and on the map_.
+- Press the "Open" button: _file navigation window pops up_.
+- Open the same model again: _A new layer group is added to the layers panel_.
 
 Intended behavior: The same model is loaded twice, but there is only a connection on the last loaded model when interacting with the plugin.
 
-# Nodes tab button interaction tests
-
-## Add all tables to new model
-
-- Open QGIS and ensure that the Ribasim plugin is installed and enabled.
-- Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
-- Press the "New" button in the Model tab: _file navigation window pops up_.
-- Fill in a name ("test1").
-- Press OK: _A TOML and database file are created on the given location_.
-- Go to the Nodes tab: _All buttons are enabled_.
-- From left to right, top to bottom, press every button to add tables to the layers: _The layer group contains extra layers for every button clicked. Basin / area is a MultiPolygon layer_.
-- Navigate to Model tab: _All layers are added to the panel_.
-- Press the "Open" button to open the same model once again: _The layers panel adds the model containing all of its layers, the Model tab was refreshed_.
-
-## Add table twice to new model
-
-- Open QGIS and ensure that the Ribasim plugin is installed and enabled.
-- Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
-- Press the "New" button in the Model tab: _file navigation window pops up_.
-- Fill in a name ("test1").
-- Press OK: _A TOML and database file are created on the given location_.
-- Go to the Nodes tab: _All buttons are enabled_.
-- Press the Basin / time button: _A layer is added to the layers panel with that name, the button becomes disabled_.
-
-❌ [Failing](https://github.com/Deltares/Ribasim/issues/1685)
-
 # Map interaction tests
 
-## Add points to Node layer
-
-- Open QGIS and ensure that the Ribasim plugin is installed and enabled.
-- Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
-- Press the "New" button in the Model tab: _file navigation window pops up_.
-- Fill in a name ("test1").
-- Press OK: _A TOML and database file are created on the given location_.
-- Select the Node layer in the Layers tab: _edit buttons in the toolbar become enabled_.
-- Edit the layer by pressing the pencil button: _Add Point Feature button becomes enabled_.
-- Click in the canvas: _Popup appears with Feature Attributes to fill in_.
-- Press OK: _The first Node appears on the map_.
-- Click in the canvas again: _Popup appears with Feature Attributes to fill in_.
-- Press OK: _The second Node appears on the map_.
-
-Unexpected behavior: The default type of the nodes is NULL, and therefore undefined.
-Should be enforced and validated.
-See [issue](https://github.com/Deltares/Ribasim/issues/1688#issuecomment-2265315907).
-
-## Add links to Link layer
-
-- Open QGIS and ensure that the Ribasim plugin is installed and enabled.
-- Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
-- Press the "New" button in the Model tab: _file navigation window pops up_.
-- Fill in a name ("test1").
-- Press OK: _A TOML and database file are created on the given location_.
-- Select the Node layer in the Layers tab: _edit buttons in the toolbar become enabled_.
-- Edit the layer by pressing the pencil button: _Add Point Feature button becomes enabled_.
-- Click in the canvas: _Popup appears with Feature Attributes to fill in_.
-- Add a node id of 1, press OK: _The first Node appears on the map_.
-- Click in the canvas again: _Popup appears with Feature Attributes to fill in_.
-- Add a node id of 2, press OK: _The second Node appears on the map_.
-- Select the Link layer in the Layers tab: _edit buttons in the toolbar become enabled_.
-- Enable snapping under View > Toolbars > Snapping Toolbars: _Magnet button is enabled and active_.
-- Press the Add Line Feature button: _Mouse becomes a crosshair_.
-- Snap a line between the two nodes, click the two nodes and then right click to finish: _Popup shows with input, most fields are set to NULL_.
-- Press OK: _Line appears on screen between the two nodes_.
-- Save the layer's edits: _The line becomes blue_.
-- Open the attribute table: _The information shows the from\_node\_id, to\_node\_id. This information matches the information from the Node table._
-
 ## Node selection on map triggers table selection
 
 - Open QGIS and ensure that the Ribasim plugin is installed and enabled.
 - Open the application via the Ribasim button on the QGIS toolbar: _Ribasim panel opens_.
-- Press the "Open" button in the Model tab: _file navigation window pops up_.
+- Press the "Open" button in the Ribasim panel: _file navigation window pops up_.
 - Choose an existing model from the `generated_testmodels` folder.
 - Press OK: _The model layers appear in the layer panel and on the map_.
 - Select the node layer, and make a subselection of nodes on the map: _Nodes are highlighted in yellow, including their links_.
 - Open the Link attribute table: _The highlighted rows are those with a from/to node\_id that was selected_.
-- Open any non-spatial attribute table: _The highlighted rows are those with an node\_id that was selected_.
+- Open any non-spatial attribute table: _The highlighted rows are those with a node\_id that was selected_.
 
 # Result inspection tests
 
diff --git a/docs/install.qmd b/docs/install.qmd
@@ -81,8 +81,8 @@ executable is in the main folder.
 
 To download the Ribasim core, download the appropriate zip file for your operating system:
 
-- Ribasim executable - Windows: [ribasim_windows.zip](https://github.com/Deltares/Ribasim/releases/download/v2025.4.0/ribasim_windows.zip)
-- Ribasim executable - Linux: [ribasim_linux.zip](https://github.com/Deltares/Ribasim/releases/download/v2025.4.0/ribasim_linux.zip)
+- Ribasim executable - Windows: [ribasim_windows.zip](https://github.com/Deltares/Ribasim/releases/download/v2025.5.0/ribasim_windows.zip)
+- Ribasim executable - Linux: [ribasim_linux.zip](https://github.com/Deltares/Ribasim/releases/download/v2025.5.0/ribasim_linux.zip)
 
 Note that we currently only support and provide binaries for Windows and Linux, for the x86_64 architecture.
 
@@ -138,7 +138,7 @@ pixi init
 ```
 Now add Ribasim Python:
 ```sh
-pixi add ribasim==2025.4.0
+pixi add ribasim==2025.5.0
 ```
 To start Python, run:
 ```sh
@@ -162,7 +162,7 @@ uv init
 ```
 Now add Ribasim Python:
 ```sh
-uv add ribasim==2025.4.0
+uv add ribasim==2025.5.0
 ```
 To start Python, run:
 ```sh
@@ -172,7 +172,7 @@ uv run python
 ## pip
 
 ```sh
-pip install --upgrade ribasim==2025.4.0
+pip install --upgrade ribasim==2025.5.0
 ```
 
 ## conda
@@ -182,7 +182,7 @@ Ribasim is available in the [conda-forge](https://conda-forge.org/) channel.
 It may not work well when combined with the Anaconda default channel, see [transitioning from defaults](https://conda-forge.org/docs/user/transitioning_from_defaults/).
 
 ```sh
-conda install -c conda-forge ribasim=2025.4.0
+conda install -c conda-forge ribasim=2025.5.0
 ```
 
 :::
@@ -198,7 +198,7 @@ The Ribasim QGIS plugin is only distributed as a .zip archive and must be downlo
 
 Download `ribasim_qgis.zip`:
 
-- QGIS plugin: [ribasim_qgis.zip](https://github.com/Deltares/Ribasim/releases/download/v2025.4.0/ribasim_qgis.zip).
+- QGIS plugin: [ribasim_qgis.zip](https://github.com/Deltares/Ribasim/releases/download/v2025.5.0/ribasim_qgis.zip).
 
 In QGIS, go to Plugins menu > Manage and Install Plugins...
 
diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -1,6 +1,6 @@
 [project]
 name = "Ribasim"
-version = "2025.4.0"
+version = "2025.5.0"
 description = "Water resources modeling"
 authors = ["Deltares and contributors <ribasim.info@deltares.nl>"]
 channels = ["conda-forge"]
diff --git a/python/ribasim/ribasim/__init__.py b/python/ribasim/ribasim/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2025.4.0"
+__version__ = "2025.5.0"
 __schema_version__ = 8
 
 import logging
diff --git a/python/ribasim_api/ribasim_api/__init__.py b/python/ribasim_api/ribasim_api/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2025.4.0"
+__version__ = "2025.5.0"
 
 from ribasim_api.ribasim_api import RibasimApi
 
diff --git a/ribasim_qgis/metadata.txt b/ribasim_qgis/metadata.txt
@@ -7,7 +7,7 @@
 name=Ribasim
 qgisMinimumVersion=3.34
 description=QGIS plugin to setup Ribasim models
-version=2025.4.0
+version=2025.5.0
 author=Deltares and contributors
 email=ribasim.info@deltares.nl
 
diff --git a/ribasim_qgis/tests/data/simple_valid.toml b/ribasim_qgis/tests/data/simple_valid.toml
@@ -3,4 +3,4 @@ endtime = 2021-01-01 00:00:00
 crs = "EPSG:28992"
 input_dir = "."
 results_dir = "results"
-ribasim_version = "2025.4.0"
+ribasim_version = "2025.5.0"
