From 0ce3c2d63b43df34d247234d55de638121eee21b Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Tue, 13 Feb 2024 10:24:29 -0500 Subject: [PATCH 1/2] chore: remove unused import --- .../dmod/modeldata/hydrofabric/geopackage_hydrofabric.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py b/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py index dafa49217..678629d0f 100644 --- a/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py +++ b/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py @@ -2,7 +2,6 @@ import geopandas as gpd import hashlib from pandas.util import hash_pandas_object -import numpy as np from pathlib import Path from typing import Callable, Dict, FrozenSet, Iterable, List, Optional, Tuple, Union from hypy import Catchment, Nexus, Realization From c2461e465a37113dcc7486af4dceff1f244cf8dc Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Tue, 13 Feb 2024 10:25:01 -0500 Subject: [PATCH 2/2] fix: type hints --- .../dmod/modeldata/hydrofabric/geopackage_hydrofabric.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py b/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py index 678629d0f..0f955b1eb 100644 --- a/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py +++ b/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py @@ -100,7 +100,7 @@ def _get_catchment_record(self) -> gpd.GeoDataFrame: return df @property - def conjoined_catchments(self) -> Tuple['GeoPackageCatchment']: + def conjoined_catchments(self) -> Tuple['GeoPackageCatchment', ...]: """ Returns @@ -112,7 +112,7 @@ def conjoined_catchments(self) -> Tuple['GeoPackageCatchment']: c is not None]) @property - def contained_catchments(self) -> Tuple['GeoPackageCatchment']: + def contained_catchments(self) -> Tuple['GeoPackageCatchment', ...]: """ Tuple of catchment object having an "is-in" relationship with this catchment object. @@ -275,7 +275,7 @@ def id(self) -> str: return self._nex_id @property - def receiving_catchments(self) -> Tuple['GeoPackageCatchment']: + def receiving_catchments(self) -> Tuple['GeoPackageCatchment', ...]: """ Tuple of GeoPackageCatchment object(s) receiving water from nexus @@ -289,7 +289,7 @@ def receiving_catchments(self) -> Tuple['GeoPackageCatchment']: return tuple([c for c in catchments if c is not None]) @property - def contributing_catchments(self) -> Tuple['GeoPackageCatchment']: + def contributing_catchments(self) -> Tuple['GeoPackageCatchment', ...]: """ Tuple of GeoPackageCatchment object(s) contributing water to nexus