From c2df42284786d6bf09f062c411a87b2776d80524 Mon Sep 17 00:00:00 2001 From: Roy Smart Date: Sat, 22 Nov 2025 15:22:53 -0700 Subject: [PATCH] Squash more Numpy 2 warnings. --- ndfilters/_convolve.py | 2 +- ndfilters/_tests/test_convolve.py | 2 +- ndfilters/_tests/test_mean.py | 2 +- ndfilters/_tests/test_median.py | 2 +- ndfilters/_tests/test_trimmed_mean.py | 2 +- ndfilters/_tests/test_variance.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ndfilters/_convolve.py b/ndfilters/_convolve.py index 9f4d40c..9b3dfca 100644 --- a/ndfilters/_convolve.py +++ b/ndfilters/_convolve.py @@ -103,7 +103,7 @@ def convolve( if axis is None: axis = tuple(range(array.ndim)) axis = np.array(axis) - axis = np.core.numeric.normalize_axis_tuple(~axis, ndim=array.ndim) + axis = np.lib.array_utils.normalize_axis_tuple(~axis, ndim=array.ndim) axis = ~np.array(axis) shape_kernel = list(kernel.shape) diff --git a/ndfilters/_tests/test_convolve.py b/ndfilters/_tests/test_convolve.py index 26685c2..0445646 100644 --- a/ndfilters/_tests/test_convolve.py +++ b/ndfilters/_tests/test_convolve.py @@ -63,7 +63,7 @@ def test_convolve( axis_ = axis if axis_ is None: axis_ = np.arange(array.ndim) - axis_ = np.core.numeric.normalize_axis_tuple(axis_, ndim=array.ndim) + axis_ = np.lib.array_utils.normalize_axis_tuple(axis_, ndim=array.ndim) axis_orthogonal = [ax for ax in range(array.ndim) if ax not in axis_] diff --git a/ndfilters/_tests/test_mean.py b/ndfilters/_tests/test_mean.py index 268a38b..cb3019b 100644 --- a/ndfilters/_tests/test_mean.py +++ b/ndfilters/_tests/test_mean.py @@ -58,7 +58,7 @@ def test_mean_filter( axis_normalized = tuple(range(array.ndim)) else: try: - axis_normalized = np.core.numeric.normalize_axis_tuple( + axis_normalized = np.lib.array_utils.normalize_axis_tuple( axis, ndim=array.ndim ) except np.exceptions.AxisError: diff --git a/ndfilters/_tests/test_median.py b/ndfilters/_tests/test_median.py index 241f9d1..322bdf7 100644 --- a/ndfilters/_tests/test_median.py +++ b/ndfilters/_tests/test_median.py @@ -58,7 +58,7 @@ def test_median_filter( axis_normalized = tuple(range(array.ndim)) else: try: - axis_normalized = np.core.numeric.normalize_axis_tuple( + axis_normalized = np.lib.array_utils.normalize_axis_tuple( axis, ndim=array.ndim ) except np.exceptions.AxisError: diff --git a/ndfilters/_tests/test_trimmed_mean.py b/ndfilters/_tests/test_trimmed_mean.py index 7d1f30c..441f340 100644 --- a/ndfilters/_tests/test_trimmed_mean.py +++ b/ndfilters/_tests/test_trimmed_mean.py @@ -61,7 +61,7 @@ def test_trimmed_mean_filter( axis_normalized = tuple(range(array.ndim)) else: try: - axis_normalized = np.core.numeric.normalize_axis_tuple( + axis_normalized = np.lib.array_utils.normalize_axis_tuple( axis, ndim=array.ndim ) except np.exceptions.AxisError: diff --git a/ndfilters/_tests/test_variance.py b/ndfilters/_tests/test_variance.py index bbbaa31..4ef82dd 100644 --- a/ndfilters/_tests/test_variance.py +++ b/ndfilters/_tests/test_variance.py @@ -58,7 +58,7 @@ def test_variance_filter( axis_normalized = tuple(range(array.ndim)) else: try: - axis_normalized = np.core.numeric.normalize_axis_tuple( + axis_normalized = np.lib.array_utils.normalize_axis_tuple( axis, ndim=array.ndim ) except np.exceptions.AxisError: