diff --git a/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py b/python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py index dafa49217..0f955b1eb 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 @@ -101,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 @@ -113,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. @@ -276,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 @@ -290,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