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

Jump to bottom

Fix modeldata.geopackge_hydrofabric type hints #523

Merged
merged 2 commits into from
Mar 7, 2024
Merged

Fix modeldata.geopackge_hydrofabric type hints #523

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ce3c2d
chore: remove unused import
aaraney Feb 13, 2024
c2461e4
fix: type hints
aaraney Feb 13, 2024
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
9 changes: 4 additions & 5 deletions python/lib/modeldata/dmod/modeldata/hydrofabric/geopackage_hydrofabric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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.

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down
Loading