diff --git a/requirements.txt b/requirements.txt index e635320d..82f06cdc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ scipy==1.* tqdm scikit-image==0.* scikit-gstat>=1.0 +geoutils==0.1.* pip -geoutils setuptools>=64 setuptools_scm[toml]>=8 diff --git a/tests/test_spatialstats.py b/tests/test_spatialstats.py index 6b468b84..c71e6961 100644 --- a/tests/test_spatialstats.py +++ b/tests/test_spatialstats.py @@ -72,7 +72,9 @@ def test_nd_binning(self) -> None: """Check that the nd_binning function works adequately and save dataframes to files for later tests""" # Subsampler - indices = gu.raster.subsample_array(self.diff.data.flatten(), sample=10000, return_indices=True, random_state=42) + indices = gu.raster.subsample_array( + self.diff.data.flatten(), sample=10000, return_indices=True, random_state=42 + ) # 1D binning, by default will create 10 bins df = xdem.spatialstats.nd_binning( diff --git a/xdem/coreg/base.py b/xdem/coreg/base.py index 46e7516c..aea4b2d2 100644 --- a/xdem/coreg/base.py +++ b/xdem/coreg/base.py @@ -42,8 +42,8 @@ RasterType, get_array_and_mask, raster, - subsample_array, subdivide_array, + subsample_array, ) from tqdm import tqdm diff --git a/xdem/spatialstats.py b/xdem/spatialstats.py index 70d67737..5b695611 100644 --- a/xdem/spatialstats.py +++ b/xdem/spatialstats.py @@ -15,7 +15,13 @@ import numba import numpy as np import pandas as pd -from geoutils.raster import Mask, Raster, RasterType, get_array_and_mask, subsample_array +from geoutils.raster import ( + Mask, + Raster, + RasterType, + get_array_and_mask, + subsample_array, +) from geoutils.vector import Vector, VectorType from numpy.typing import ArrayLike from scipy import integrate