Merge branch 'main' into feat/gpkg-styles

Deltares · Aug 12, 2024 · 91579c2 · 91579c2
2 parents 548f2bb + c8d9f82
commit 91579c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/ribasim/ribasim/delwaq/util.py b/python/ribasim/ribasim/delwaq/util.py
@@ -122,7 +122,7 @@ def ugrid(G) -> xugrid.UgridDataset:
     to_node_id = edge_df.to_node_id.to_numpy()
 
     # from node_id to the node_dim index
-    node_lookup: pd.Series[int] = pd.Series(
+    node_lookup = pd.Series(
         index=node_id,
         data=node_id.argsort().astype(np.int32),
         name="node_index",

diff --git a/python/ribasim/ribasim/input_base.py b/python/ribasim/ribasim/input_base.py
@@ -181,7 +181,7 @@ def _check_extra_columns(cls, v: DataFrame[TableT]):
             for colname in v.columns:
                 if colname == "fid":
                     # Autogenerated on writing, don't carry them
-                    v = v.drop(columns=["fid"])  # type: ignore
+                    v = v.drop(columns=["fid"])
                 elif colname not in cls.columns() and not colname.startswith("meta_"):
                     raise ValueError(
                         f"Unrecognized column '{colname}'. Extra columns need a 'meta_' prefix."