Remove remaining reference to distutils.version

Also add a version skip for imatmul
serge-sans-paille · May 14, 2024 · 0b25ceb · 0b25ceb
1 parent be88cdd
commit 0b25ceb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pythran/tests/test_advanced.py b/pythran/tests/test_advanced.py
@@ -5,6 +5,7 @@
 import numpy
 
 from pythran.typing import *
+from packaging.version import Version
 
 class TestAdvanced(TestEnv):
 
@@ -287,6 +288,7 @@ def test_matmul_operator(self):
             numpy.array([[0., 2.], [1., 3.]]),
             matmul_operator=[NDArray[float, :,:], NDArray[float, :,:]])
 
+    @skipIf(Version(numpy.__version__) <= Version('1.26'), "Not supported upstream")
     def test_imatmul_operator(self):
         code = 'def imatmul_operator(x, y): x @= y; return x'
         self.run_test(

diff --git a/pythran/tests/test_ndarray.py b/pythran/tests/test_ndarray.py
@@ -2,8 +2,6 @@
 from pythran.typing import NDArray, Tuple, List
 
 import numpy
-from distutils.version import LooseVersion
-
 import unittest
 
 try:

diff --git a/pythran/tests/test_numpy_fft.py b/pythran/tests/test_numpy_fft.py
@@ -2,7 +2,7 @@
 from pythran.tests import TestEnv
 import numpy
 from pythran.typing import NDArray
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 
 class TestNumpyRFFT(TestEnv):
@@ -18,7 +18,7 @@ def test_rfft_2(self):
     def test_rfft_3(self):
         self.run_test("def test_rfft_3(x,n): from numpy.fft import rfft ; return rfft(x,n)", numpy.arange(0,8.),7, test_rfft_3=[NDArray[float,:],int])
 
-    @unittest.skipIf(LooseVersion(numpy.__version__) >= '2', "see https://github.com/numpy/numpy/issues/26349")
+    @unittest.skipIf(Version(numpy.__version__) >= Version('2'), "see https://github.com/numpy/numpy/issues/26349")
     def test_rfft_4(self):
         self.run_test("def test_rfft_4(x,n): from numpy.fft import rfft ; return rfft(x,n)", numpy.arange(0,8.),6, test_rfft_4=[NDArray[float,:],int])
 
@@ -132,15 +132,15 @@ def test_fftn_11b(self):
 
     # Various norms
 
-    @unittest.skipIf(LooseVersion(numpy.__version__) <'1.20', "introduced in 1.20")
+    @unittest.skipIf(Version(numpy.__version__) < Version('1.20'), "introduced in 1.20")
     def test_fftn_12(self):
         self.run_test("def test_fftn_12(x): from numpy.fft import fftn ; return fftn(x, (6,), norm='backward')",
                       numpy.arange(0,8), test_fftn_12=[NDArray[int,:]])
     def test_fftn_13(self):
         self.run_test("def test_fftn_13(x): from numpy.fft import fftn ; return fftn(x, (8,), norm='ortho')",
                       numpy.arange(0,8.), test_fftn_13=[NDArray[float,:]])
 
-    @unittest.skipIf(LooseVersion(numpy.__version__) <'1.20', "introduced in 1.20")
+    @unittest.skipIf(Version(numpy.__version__) < Version('1.20'), "introduced in 1.20")
     def test_fftn_14(self):
         self.run_test("def test_fftn_14(x): from numpy.fft import fftn ; return fftn(x, (10,), norm='forward')",
                       numpy.arange(0, 8.) + 1.j, test_fftn_14=[NDArray[complex,:]])
@@ -258,7 +258,7 @@ def test_ihfft_2(self):
     def test_ihfft_3(self):
         self.run_test("def test_ihfft_3(x,n): from numpy.fft import ihfft ; return ihfft(x,n)", numpy.arange(0,8.),7, test_ihfft_3=[NDArray[float,:],int])
 
-    @unittest.skipIf(LooseVersion(numpy.__version__) >= '2', "see https://github.com/numpy/numpy/issues/26349")
+    @unittest.skipIf(Version(numpy.__version__) >= Version('2'), "see https://github.com/numpy/numpy/issues/26349")
     def test_ihfft_4(self):
         self.run_test("def test_ihfft_4(x,n): from numpy.fft import ihfft ; return ihfft(x,n)", numpy.arange(0,8.),6, test_ihfft_4=[NDArray[float,:],int])