Merge pull request #19240 from charris/backport-19214

charris · web-flow · commit 5da37d56de1b · 2021-06-13T17:43:55.000-06:00
ENH: Support major version larger than 9 in NumpyVersion
diff --git a/numpy/lib/_version.py b/numpy/lib/_version.py
@@ -15,7 +15,7 @@ class NumpyVersion():
     """Parse and compare numpy version strings.
 
     NumPy has the following versioning scheme (numbers given are examples; they
-    can be > 9) in principle):
+    can be > 9 in principle):
 
     - Released version: '1.8.0', '1.8.1', etc.
     - Alpha: '1.8.0a1', '1.8.0a2', etc.
@@ -54,7 +54,7 @@ class NumpyVersion():
 
     def __init__(self, vstring):
         self.vstring = vstring
-        ver_main = re.match(r'\d\.\d+\.\d+', vstring)
+        ver_main = re.match(r'\d+\.\d+\.\d+', vstring)
         if not ver_main:
             raise ValueError("Not a valid numpy version string")
 
diff --git a/numpy/lib/tests/test__version.py b/numpy/lib/tests/test__version.py
@@ -7,7 +7,7 @@
 
 def test_main_versions():
     assert_(NumpyVersion('1.8.0') == '1.8.0')
-    for ver in ['1.9.0', '2.0.0', '1.8.1']:
+    for ver in ['1.9.0', '2.0.0', '1.8.1', '10.0.1']:
         assert_(NumpyVersion('1.8.0') < ver)
 
     for ver in ['1.7.0', '1.7.1', '0.9.9']:
