diff --git a/core/src/util.jl b/core/src/util.jl index fb1521214..38bed6f29 100644 --- a/core/src/util.jl +++ b/core/src/util.jl @@ -447,7 +447,7 @@ function get_all_priorities(db::DB, config::Config)::Vector{Int32} (FlowDemandTimeV1, "FlowDemand / time"), ] priority_col = load_structvector(db, config, type).priority - priority_col = coalesce.(priority_col, Int32(0)) + priority_col = Int32.(coalesce.(priority_col, Int32(0))) if valid_priorities(priority_col, config.allocation.use_allocation) union!(priorities, priority_col) else diff --git a/pixi.toml b/pixi.toml index eaa5342dc..b8759c8f2 100644 --- a/pixi.toml +++ b/pixi.toml @@ -88,6 +88,7 @@ test-ribasim-regression = { cmd = "julia --project=core --eval 'using Pkg; Pkg.t generate-testmodels = { cmd = "python utils/generate-testmodels.py", inputs = [ "python/ribasim", "python/ribasim_testmodels", + "utils/generate-testmodels.py", ], outputs = [ "generated_testmodels", ] } diff --git a/python/ribasim/ribasim/delwaq/generate.py b/python/ribasim/ribasim/delwaq/generate.py index bb1bf8e5a..e99abd63c 100644 --- a/python/ribasim/ribasim/delwaq/generate.py +++ b/python/ribasim/ribasim/delwaq/generate.py @@ -74,7 +74,8 @@ def _make_boundary(data, boundary_type): .reset_index() .reset_index(drop=True) ) - piv.time = piv.time.dt.strftime("%Y/%m/%d-%H:%M:%S") + # Convert Arrow time to Numpy to avoid needing tzdata somehow + piv.time = pd.to_datetime(piv.time).dt.strftime("%Y-%m-%d %H:%M:%S") boundary = { "name": bid, "substances": list(map(_quote, piv.columns[1:])),