Merge pull request python-quantities#238 from mscheltienne/np2-fix

apdavison · web-flow · commit 4e82387caa05 · 2024-08-27T15:20:52.000+02:00
Fix numpy version string parsing
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ dist
 .idea
 .*cache/
 _version.py
-MANIFEST
+MANIFEST
+.venv
diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py
@@ -9,7 +9,8 @@
 from .registry import unit_registry
 from .decorators import memoize
 
-_np_version = tuple(map(int, np.__version__.split('.')))
+_np_version = tuple(map(int, np.__version__.split(".dev")[0].split(".")))
+
 
 def assert_isinstance(obj, types):
     try:
diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -291,7 +291,7 @@ def __array_prepare__(self, obj, context=None):
         return res
 
     def __array_wrap__(self, obj, context=None, return_scalar=False):
-        _np_version = tuple(map(int, np.__version__.split('.')))
+        _np_version = tuple(map(int, np.__version__.split(".dev")[0].split(".")))
         # For NumPy < 2.0 we do old behavior
         if _np_version < (2, 0, 0):
             if not isinstance(obj, Quantity):
diff --git a/quantities/tests/test_umath.py b/quantities/tests/test_umath.py
@@ -3,7 +3,7 @@
 from .. import units as pq
 from .common import TestCase, unittest
 
-_np_version = tuple(map(int, np.__version__.split('.')))
+_np_version = tuple(map(int, np.__version__.split(".dev")[0].split(".")))
 
 
 class TestUmath(TestCase):
