10000 Merge pull request #19144 from charris/backport-19142 · numpy/numpy@1591e61 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1591e61

Browse files
charrischarris
authored
Merge pull request #19144 from charris/backport-19142
BUG: expose short_version as previously in version.py
2 parents a6e0503 + a959408 commit 1591e61

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

‎numpy/tests/test_numpy_version.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,13 @@ def test_valid_numpy_version():
3232
res = re.match(version_pattern + dev_suffix + '$', np.__version__)
3333

3434
assert_(res is not None, np.__version__)
35+
36+
37+
def test_short_version():
38+
# Check numpy.short_version actually exists
39+
if np.version.release:
40+
assert_(np.__version__ == np.version.short_version,
41+
"short_version mismatch in release version")
42+
else:
43+
assert_(np.__version__.split("+")[0] == np.version.short_version,
44+
"short_version mismatch in development version")

‎numpy/version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
full_version: str = vinfo['version']
88
git_revision: str = vinfo['full-revisionid']
99
release = 'dev0' not in version and '+' not in version
10+
short_version: str = vinfo['version'].split("+")[0]
1011

1112
del get_versions, vinfo

0 commit comments

Comments
 (0)
0