Fix and restore tests in test_numpy_version.py

rgommers · rgommers · commit 0cb6e3bc8976 · 2023-08-09T11:02:51.000+02:00
[skip cirrus] [skip azp]
diff --git a/numpy/tests/test_numpy_version.py b/numpy/tests/test_numpy_version.py
@@ -25,7 +25,17 @@ def test_valid_numpy_version():
     # Verify that the numpy version is a valid one (no .post suffix or other
     # nonsense).  See gh-6431 for an issue caused by an invalid version.
     version_pattern = r"^[0-9]+\.[0-9]+\.[0-9]+(a[0-9]|b[0-9]|rc[0-9])?"
-    dev_suffix = r"(dev[0-9]+\+git[0-9]+\.[0-9a-f]+)?"
+    dev_suffix = r"(\.dev[0-9]+\+git[0-9]+\.[0-9a-f]+)?"
     res = re.match(version_pattern + dev_suffix + '$', np.__version__)
 
     assert_(res is not None, np.__version__)
+
+
+def test_short_version():
+    # Check numpy.short_version actually exists
+    if np.version.release:
+        assert_(np.__version__ == np.version.short_version,
+                "short_version mismatch in release version")
+    else:
+        assert_(np.__version__.split("+")[0] == np.version.short_version,
+                "short_version mismatch in development version")
