From 75495a3cdedfd2ed381744732ca1c2a274ad10db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Kieffer?= Date: Mon, 31 May 2021 16:21:10 +0200 Subject: BUG: re-introduce short-version as it was --- numpy/tests/test_numpy_version.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'numpy/tests/test_numpy_version.py') 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") -- cgit v1.2.1 From d69325a15d17e4fc9118e41640938b36f977af47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Kieffer?= Date: Mon, 31 May 2021 16:26:45 +0200 Subject: TST: fix pylint --- numpy/tests/test_numpy_version.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'numpy/tests/test_numpy_version.py') diff --git a/numpy/tests/test_numpy_version.py b/numpy/tests/test_numpy_version.py index f9399cc93..01f5ea0e1 100644 --- a/numpy/tests/test_numpy_version.py +++ b/numpy/tests/test_numpy_version.py @@ -37,6 +37,8 @@ def test_valid_numpy_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") + 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") + assert_(numpy.__version__.split("+")[0] == numpy.version.short_version, + "short_version not in release") -- cgit v1.2.1 From f105a323d8f40b70a7e1b383468733968badbf26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Kieffer?= Date: Mon, 31 May 2021 16:31:18 +0200 Subject: TST Fix typo --- numpy/tests/test_numpy_version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'numpy/tests/test_numpy_version.py') diff --git a/numpy/tests/test_numpy_version.py b/numpy/tests/test_numpy_version.py index 01f5ea0e1..eddd0710d 100644 --- a/numpy/tests/test_numpy_version.py +++ b/numpy/tests/test_numpy_version.py @@ -37,8 +37,8 @@ def test_valid_numpy_version(): def test_short_version(): # Check numpy.short_version actually exists if np.version.release: - assert_(numpy.__version__ == numpy.version.short_version, + assert_(np.__version__ == np.version.short_version, "short_version in release") else: - assert_(numpy.__version__.split("+")[0] == numpy.version.short_version, + assert_(np.__version__.split("+")[0] == np.version.short_version, "short_version not in release") -- cgit v1.2.1 From abf9fe9add589166c383e2cc0674499683fcaa7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Kieffer?= Date: Mon, 31 May 2021 20:23:21 +0200 Subject: TST fix comment of assert+indentation --- numpy/tests/test_numpy_version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'numpy/tests/test_numpy_version.py') diff --git a/numpy/tests/test_numpy_version.py b/numpy/tests/test_numpy_version.py index eddd0710d..bccbcb8e9 100644 --- a/numpy/tests/test_numpy_version.py +++ b/numpy/tests/test_numpy_version.py @@ -38,7 +38,7 @@ def test_short_version(): # Check numpy.short_version actually exists if np.version.release: assert_(np.__version__ == np.version.short_version, - "short_version in release") + "short_version mismatch in release version") else: assert_(np.__version__.split("+")[0] == np.version.short_version, - "short_version not in release") + "short_version mismatch in development version") -- cgit v1.2.1