Merge remote-tracking branch 'origin/main' into partial-layout-interface

Qiskit · Aug 29, 2023 · ec27005 · ec27005
2 parents f588a4f + 66f1048
commit ec27005
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/test/python/algorithms/optimizers/test_optimizers_scikitquant.py b/test/python/algorithms/optimizers/test_optimizers_scikitquant.py
@@ -69,7 +69,8 @@ def test_bobyqa(self):
             self.skipTest(str(ex))
 
     @unittest.skipIf(
-        tuple(map(int, numpy.__version__.split("."))) >= (1, 24, 0),
+        # NB: numpy.__version__ may contain letters, e.g. "1.26.0b1"
+        tuple(map(int, numpy.__version__.split(".")[:2])) >= (1, 24),
         "scikit's SnobFit currently incompatible with NumPy 1.24.0.",
     )
     def test_snobfit(self):
@@ -81,7 +82,8 @@ def test_snobfit(self):
             self.skipTest(str(ex))
 
     @unittest.skipIf(
-        tuple(map(int, numpy.__version__.split("."))) >= (1, 24, 0),
+        # NB: numpy.__version__ may contain letters, e.g. "1.26.0b1"
+        tuple(map(int, numpy.__version__.split(".")[:2])) >= (1, 24),
         "scikit's SnobFit currently incompatible with NumPy 1.24.0.",
     )
     @data((None,), ([(-1, 1), (None, None)],))