diff options
| author | Jérôme Kieffer <jerome.kieffer@terre-adelie.org> | 2021-05-31 16:21:10 +0200 |
|---|---|---|
| committer | Jérôme Kieffer <jerome.kieffer@terre-adelie.org> | 2021-05-31 16:21:10 +0200 |
| commit | 75495a3cdedfd2ed381744732ca1c2a274ad10db (patch) | |
| tree | 70f59cf6bdb1096d6abc789469043d32631854d7 /numpy | |
| parent | 4f7213b9794c6a04dfdc3de3add7bab51de5ede9 (diff) | |
| download | numpy-75495a3cdedfd2ed381744732ca1c2a274ad10db.tar.gz | |
BUG: re-introduce short-version as it was
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/tests/test_numpy_version.py | 8 | ||||
| -rw-r--r-- | numpy/version.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/numpy/tests/test_numpy_version.py b/numpy/tests/test_numpy_version.py index 28595026e..f9399cc93 100644 --- a/numpy/tests/test_numpy_version.py +++ b/numpy/tests/test_numpy_version.py @@ -32,3 +32,11 @@ def test_valid_numpy_version(): 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_(numpy.__version__ == numpy.version.short_version, "short_version in release") + else: + assert_(numpy.__version__.split("+")[0] == numpy.version.short_version, "short_version not in release") diff --git a/numpy/version.py b/numpy/version.py index 70f9f0982..4159a1c0e 100644 --- a/numpy/version.py +++ b/numpy/version.py @@ -5,8 +5,8 @@ __ALL__ = ['version', 'full_version', 'git_revision', 'release'] vinfo = get_versions() version: str = vinfo["version"] full_version: str = vinfo['version'] -short_version: str = vinfo['version'] git_revision: str = vinfo['full-revisionid'] release = 'dev0' not in version and '+' not in version +short_version: str = vinfo['version'].split("+")[0] del get_versions, vinfo |