From 2e9e1db0db04843426bb8d58622d3829c6e48a4d Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Tue, 23 Jul 2024 16:18:59 +0200 Subject: [PATCH] Prepare release 2024.10.0 Updates the changelog and version numbers. --- Manifest.toml | 2 +- build/cli/Cargo.lock | 2 +- build/cli/Cargo.toml | 2 +- core/Project.toml | 2 +- core/test/data/config_test.toml | 2 +- .../data/logging_test_loglevel_debug.toml | 2 +- core/test/data/logging_test_no_loglevel.toml | 2 +- core/test/docs.toml | 2 +- docs/changelog.qmd | 30 +++++++++++++++++++ pixi.lock | 4 +-- pixi.toml | 2 +- python/ribasim/ribasim/__init__.py | 2 +- python/ribasim_api/ribasim_api/__init__.py | 2 +- ribasim_qgis/metadata.txt | 2 +- ribasim_qgis/tests/data/simple_valid.toml | 2 +- ribasim_qgis/widgets/dataset_widget.py | 2 +- 16 files changed, 46 insertions(+), 16 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 80f808c21..440004eb7 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1295,7 +1295,7 @@ version = "3.5.15" deps = ["Accessors", "Arrow", "BasicModelInterface", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "DiffEqCallbacks", "EnumX", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "LinearSolve", "Logging", "LoggingExtras", "MetaGraphsNext", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SmoothInterpolation", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimerOutputs", "TranscodingStreams"] path = "core" uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635" -version = "2024.9.0" +version = "2024.10.0" [[deps.RuntimeGeneratedFunctions]] deps = ["ExprTools", "SHA", "Serialization"] diff --git a/build/cli/Cargo.lock b/build/cli/Cargo.lock index 341e203e6..c9fc80783 100644 --- a/build/cli/Cargo.lock +++ b/build/cli/Cargo.lock @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "ribasim" -version = "2024.9.0" +version = "2024.10.0" dependencies = [ "clap", "libc", diff --git a/build/cli/Cargo.toml b/build/cli/Cargo.toml index aad7202a8..b386d6282 100644 --- a/build/cli/Cargo.toml +++ b/build/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ribasim" -version = "2024.9.0" +version = "2024.10.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 index bcaf9c639..113f673cd 100644 --- a/core/Project.toml +++ b/core/Project.toml @@ -2,7 +2,7 @@ name = "Ribasim" uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635" authors = ["Deltares and contributors "] manifest = "../Manifest.toml" -version = "2024.9.0" +version = "2024.10.0" [deps] Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" diff --git a/core/test/data/config_test.toml b/core/test/data/config_test.toml index 008eb377a..7cf416317 100644 --- 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 = "../../generated_testmodels/lhm" results_dir = "../../generated_testmodels/lhm" -ribasim_version = "2024.9.0" +ribasim_version = "2024.10.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 index 7f5286fd1..a94362c64 100644 --- 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 = "2024.9.0" +ribasim_version = "2024.10.0" [logging] verbosity = "debug" diff --git a/core/test/data/logging_test_no_loglevel.toml b/core/test/data/logging_test_no_loglevel.toml index 95ecd18a1..4417b19a8 100644 --- 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 = "2024.9.0" +ribasim_version = "2024.10.0" diff --git a/core/test/docs.toml b/core/test/docs.toml index cff753a31..9b2ed206c 100644 --- 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 = "2024.9.0" # required +ribasim_version = "2024.10.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/changelog.qmd b/docs/changelog.qmd index 2406563cb..2f56e36c8 100644 --- a/docs/changelog.qmd +++ b/docs/changelog.qmd @@ -9,6 +9,35 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), ### Changed +## [v2024.10.0] - 2024-07-23 + +For this release we said goodbye to the problematic FractionalFlow node, but welcome the ContinuousControl as a long requested feature. + +### Added +- Control: Add ContinuousControl node type. #1602 +- Control: Support listening to flow through connector nodes. #1594 +- Validate that TabulatedRatingCurve levels are above Basin bottom. #1607 +- Validate that Outlet crest levels are above Basin bottom. #1607 +- Always show convergence bottlenecks. #1636 +- Docstrings for Ribasim Python. #1643 +- Allocate to UserDemand from directly connected Basin if possible. #1581 +- Add `basin_state.arrow` results. #1626 +- Also write stacktraces to `ribasim.log`. #1653 + +### Changed +- Require QGIS 3.34 (LTR) or newer for Ribasim QGIS plugin. + +### Fixed +- Compatibility with latest NumPy, Pandera and PyArrow releases. #1618 +- LevelDemand can now be without `min_level` or `max_level`. #1629 + +### Removed +- Removed unused urban runoff variable from Basin. #1611 +- Removed unneeded static table from Terminal. #1624 +- Removed FractionalFlow node. #1616 + +### Changed + ## [v2024.9.0] - 2024-06-20 ### Added @@ -24,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), ### Fixed - Don't require unique node IDs. #1513 +- Fix QGIS crash on plugin initialization. #1580 ## [v2024.8.0] - 2024-05-14 diff --git a/pixi.lock b/pixi.lock index bd2cdf2a9..2aae0e87c 100644 --- a/pixi.lock +++ b/pixi.lock @@ -33816,7 +33816,7 @@ packages: timestamp: 1598024297745 - kind: pypi name: ribasim - version: 2024.9.0 + version: 2024.10.0 path: python/ribasim sha256: be31457a51083ee5f04c05753c0308f556542c46f94a60a82f9387c5156e82ff requires_dist: @@ -33850,7 +33850,7 @@ packages: editable: true - kind: pypi name: ribasim-api - version: 2024.9.0 + version: 2024.10.0 path: python/ribasim_api sha256: 3d2210b7455ccaa058d8508690e100fa6039118c9fac925c058cfa8474185c45 requires_dist: diff --git a/pixi.toml b/pixi.toml index 3883796d5..5ea5916c5 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,6 +1,6 @@ [project] name = "Ribasim" -version = "2024.9.0" +version = "2024.10.0" description = "Water resources modeling" authors = ["Deltares and contributors "] channels = ["conda-forge"] diff --git a/python/ribasim/ribasim/__init__.py b/python/ribasim/ribasim/__init__.py index 29155ebbc..a6d0010a3 100644 --- a/python/ribasim/ribasim/__init__.py +++ b/python/ribasim/ribasim/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2024.9.0" +__version__ = "2024.10.0" from ribasim.config import Allocation, Logging, Node, Solver diff --git a/python/ribasim_api/ribasim_api/__init__.py b/python/ribasim_api/ribasim_api/__init__.py index 4bc7ff37e..ea5772dbc 100644 --- a/python/ribasim_api/ribasim_api/__init__.py +++ b/python/ribasim_api/ribasim_api/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2024.9.0" +__version__ = "2024.10.0" from ribasim_api.ribasim_api import RibasimApi diff --git a/ribasim_qgis/metadata.txt b/ribasim_qgis/metadata.txt index ba15dfb0d..6a6eab981 100644 --- 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=2024.9.0 +version=2024.10.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 index ae18a6578..d61eb0780 100644 --- 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 = "2024.9.0" +ribasim_version = "2024.10.0" diff --git a/ribasim_qgis/widgets/dataset_widget.py b/ribasim_qgis/widgets/dataset_widget.py index 0b6258a5a..4c41b9a78 100644 --- a/ribasim_qgis/widgets/dataset_widget.py +++ b/ribasim_qgis/widgets/dataset_widget.py @@ -271,7 +271,7 @@ def _write_new_model(self) -> None: f'crs = "{self.ribasim_widget.crs.authid()}"\n', 'input_dir = "."\n', 'results_dir = "results"\n', - 'ribasim_version = "2024.9.0"\n', + 'ribasim_version = "2024.10.0"\n', ] )