Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove xugrid return type annotation, bump patch version #1326

Merged
merged 1 commit into from
Mar 26, 2024
+11 −11
Merged

Remove xugrid return type annotation, bump patch version #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0"
version = "2024.6.1"

[[deps.RuntimeGeneratedFunctions]]
deps = ["ExprTools", "SHA", "Serialization"]
Expand Down
2 changes: 1 addition & 1 deletion core/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name = "Ribasim"
uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635"
authors = ["Deltares and contributors <[email protected]>"]
manifest = "../Manifest.toml"
version = "2024.6.0"
version = "2024.6.1"

[deps]
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
Expand Down
2 changes: 1 addition & 1 deletion core/test/data/config_test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0"
ribasim_version = "2024.6.1"

[basin]
time = "basin/time.arrow"
Expand Down
2 changes: 1 addition & 1 deletion core/test/data/logging_test_loglevel_debug.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ starttime = 2019-01-01
endtime = 2019-12-31
input_dir = "."
results_dir = "results"
ribasim_version = "2024.6.0"
ribasim_version = "2024.6.1"

[logging]
verbosity = "debug"
2 changes: 1 addition & 1 deletion core/test/data/logging_test_no_loglevel.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ starttime = 2019-01-01
endtime = 2019-12-31
input_dir = "."
results_dir = "results"
ribasim_version = "2024.6.0"
ribasim_version = "2024.6.1"
2 changes: 1 addition & 1 deletion core/test/docs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ endtime = 2021-01-01 # required
input_dir = "." # required
results_dir = "results" # required

ribasim_version = "2024.6.0" # required
ribasim_version = "2024.6.1" # required

# Specific tables can also go into Arrow files rather than the database.
# For large tables this can benefit from better compressed file sizes.
Expand Down
2 changes: 1 addition & 1 deletion pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "Ribasim"
version = "2024.6.0"
version = "2024.6.1"
description = "Water resources modeling"
authors = ["Deltares and contributors <[email protected]>"]
channels = ["conda-forge"]
Expand Down
2 changes: 1 addition & 1 deletion python/ribasim/ribasim/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2024.6.0"
__version__ = "2024.6.1"


from ribasim.config import Allocation, Logging, Node, Solver
Expand Down
2 changes: 1 addition & 1 deletion python/ribasim/ribasim/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def plot(self, ax=None, indicate_subnetworks: bool = True) -> Any:

return ax

def to_xugrid(self) -> xugrid.UgridDataset:
def to_xugrid(self):
"""Convert the network to a xugrid.UgridDataset."""
node_df = self.node_table().df

Expand Down
2 changes: 1 addition & 1 deletion python/ribasim_api/ribasim_api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2024.6.0"
__version__ = "2024.6.1"

from ribasim_api.ribasim_api import RibasimApi

Expand Down
2 changes: 1 addition & 1 deletion ribasim_qgis/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name=Ribasim-QGIS
qgisMinimumVersion=3.0
description=QGIS plugin to setup Ribasim models
version=2024.6.0
version=2024.6.1
author=Deltares and contributors
[email protected]

Expand Down
Loading