diff --git a/dev-environment.yml b/dev-environment.yml index 545a908c..8dfec979 100644 --- a/dev-environment.yml +++ b/dev-environment.yml @@ -19,7 +19,7 @@ dependencies: - scikit-image - scikit-gstat>=1.0 - pytransform3d - - geoutils==0.0.11 + - geoutils==0.0.13 # Development-specific - pip diff --git a/environment.yml b/environment.yml index 43a80073..520d5e83 100644 --- a/environment.yml +++ b/environment.yml @@ -19,7 +19,7 @@ dependencies: - scikit-image - scikit-gstat>=1.0 - pytransform3d - - geoutils==0.0.11 + - geoutils==0.0.13 - pip # - pip: diff --git a/xdem/coreg/base.py b/xdem/coreg/base.py index 4ebbf682..8e95c9ce 100644 --- a/xdem/coreg/base.py +++ b/xdem/coreg/base.py @@ -35,7 +35,7 @@ import scipy.ndimage import scipy.optimize import skimage.transform -from geoutils._typing import AnyNumber +from geoutils._typing import Number from geoutils.raster import ( Mask, RasterType, @@ -201,7 +201,7 @@ def _mask_dataframe_by_dem(df: pd.DataFrame | NDArrayf, dem: RasterType) -> pd.D def _calculate_ddem_stats( ddem: NDArrayf | MArrayf, inlier_mask: NDArrayf | None = None, - stats_list: tuple[Callable[[NDArrayf], AnyNumber], ...] | None = None, + stats_list: tuple[Callable[[NDArrayf], Number], ...] | None = None, stats_labels: tuple[str, ...] | None = None, ) -> dict[str, float]: """ diff --git a/xdem/coreg/pipelines.py b/xdem/coreg/pipelines.py index 081482b5..44e66471 100644 --- a/xdem/coreg/pipelines.py +++ b/xdem/coreg/pipelines.py @@ -7,7 +7,7 @@ import numpy as np import pandas as pd import rasterio as rio -from geoutils._typing import AnyNumber +from geoutils._typing import Number from geoutils.raster import RasterType from xdem._typing import NDArrayf @@ -24,9 +24,9 @@ def create_inlier_mask( shp_list: list[str | gu.Vector | None] | tuple[str | gu.Vector] | tuple[()] = (), inout: list[int] | tuple[int] | tuple[()] = (), filtering: bool = True, - dh_max: AnyNumber = None, - nmad_factor: AnyNumber = 5, - slope_lim: list[AnyNumber] | tuple[AnyNumber, AnyNumber] = (0.1, 40), + dh_max: Number = None, + nmad_factor: Number = 5, + slope_lim: list[Number] | tuple[Number, Number] = (0.1, 40), ) -> NDArrayf: """ Create a mask of inliers pixels to be used for coregistration. The following pixels can be excluded: @@ -135,9 +135,9 @@ def dem_coregistration( shp_list: list[str | gu.Vector] | tuple[str | gu.Vector] | tuple[()] = (), inout: list[int] | tuple[int] | tuple[()] = (), filtering: bool = True, - dh_max: AnyNumber = None, - nmad_factor: AnyNumber = 5, - slope_lim: list[AnyNumber] | tuple[AnyNumber, AnyNumber] = (0.1, 40), + dh_max: Number = None, + nmad_factor: Number = 5, + slope_lim: list[Number] | tuple[Number, Number] = (0.1, 40), plot: bool = False, out_fig: str = None, verbose: bool = False,