changes to raise warning only when numpy > 2.0 is used

Author: vtavana

Diff for: mkl_fft/_numpy_fft.py

@@ -73,6 +73,7 @@
 import re
 import warnings
 
+import numpy as np
 from numpy import array, asanyarray, conjugate, prod, sqrt, take
 
 from . import _float_utils
@@ -701,7 +702,7 @@ def _cook_nd_args(a, s=None, axes=None, invreal=False):
         shapeless = False
     s = list(s)
     if axes is None:
-        if not shapeless:
+        if not shapeless and np.__version__ >= "2.0":
             msg = (
                 "`axes` should not be `None` if `s` is not `None` "
                 "(Deprecated in NumPy 2.0). In a future version of NumPy, "
@@ -716,7 +717,7 @@ def _cook_nd_args(a, s=None, axes=None, invreal=False):
         raise ValueError("Shape and axes have different lengths.")
     if invreal and shapeless:
         s[-1] = (a.shape[axes[-1]] - 1) * 2
-    if None in s:
+    if None in s and np.__version__ >= "2.0":
         msg = (
             "Passing an array containing `None` values to `s` is "
             "deprecated in NumPy 2.0 and will raise an error in "

Diff for: mkl_fft/tests/test_pocketfft.py

@@ -510,7 +510,7 @@ def test_s_negative_1(self, op):
         # should use the whole input array along the first axis
         assert op(x, s=(-1, 5), axes=(0, 1)).shape == (10, 5)
 
-    @pytest.mark.skip("no warning is raised in mkl_ftt")
+    @pytest.mark.skipif(np.__version__ < "2.0", reason="Requires numpy >= 2.0")
     @pytest.mark.parametrize(
         "op", [mkl_fft.fftn, mkl_fft.ifftn, mkl_fft.rfftn, mkl_fft.irfftn]
     )
@@ -519,13 +519,14 @@ def test_s_axes_none(self, op):
         with pytest.warns(match="`axes` should not be `None` if `s`"):
             op(x, s=(-1, 5))
 
+    @pytest.mark.skipif(np.__version__ < "2.0", reason="Requires numpy >= 2.0")
     @pytest.mark.parametrize("op", [mkl_fft.fft2, mkl_fft.ifft2])
     def test_s_axes_none_2D(self, op):
         x = np.arange(100).reshape(10, 10)
         with pytest.warns(match="`axes` should not be `None` if `s`"):
             op(x, s=(-1, 5), axes=None)
 
-    @pytest.mark.skip("no warning is raised in mkl_ftt")
+    @pytest.mark.skipif(np.__version__ < "2.0", reason="Requires numpy >= 2.0")
     @pytest.mark.parametrize(
         "op",
         [