fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-01-29 11:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2380 from zas/stricter_version_from_string

Browse Source 
Make `Version.from_string()` stricter, matching from start of string
This commit is contained in:
Laurent Monin
2024-03-31 00:11:32 +01:00
committed by GitHub
parent 1329c06bde 005837e891
commit 9c91debbed
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
picard/version.py
View File

@@ -29,7 +29,7 @@ class VersionError(Exception):
class Version(namedtuple('VersionBase', 'major minor patch identifier revision')):
_version_re = re.compile(r"(\d+)(?:[._](\d+)(?:[._](\d+)[._]?(?:(dev|a|alpha|b|beta|rc|final)[._]?(\d+))?)?)?$")
_version_re = re.compile(r"^(\d+)(?:[._](\d+)(?:[._](\d+)[._]?(?:(dev|a|alpha|b|beta|rc|final)[._]?(\d+))?)?)?$")
_identifiers = {
'dev': 0,

18
test/test_versions.py
View File

@@ -74,19 +74,23 @@ class VersionsTest(PicardTestCase):
l, s = (1, 1, 0, 'dev', 0), '1_1_0_dev_0'
self.assertEqual(l, Version.from_string(s))
def test_version_from_string_prefixed(self):
l, s = (1, 1, 0, 'dev', 0), 'anything_28_1_1_0_dev_0'
self.assertEqual(l, Version.from_string(s))
def test_version_from_string_prefixed_with_num(self):
self.assertRaises(VersionError, Version.from_string, '8_1_1_0_dev_0')
def test_version_from_string_suffixed_with_num(self):
self.assertRaises(VersionError, Version.from_string, '1_1_0_dev_0_8')
def test_version_from_string_prefixed_with_alpha(self):
self.assertRaises(VersionError, Version.from_string, 'a_1_1_0_dev_0')
def test_version_from_string_suffixed_with_alpha(self):
self.assertRaises(VersionError, Version.from_string, '1_1_0_dev_0_a')
def test_version_single_digit(self):
l, s = (2, 0, 0, 'final', 0), '2'
self.assertEqual(l, Version.from_string(s))
self.assertEqual(l, Version(2))
def test_version_from_string_prefixed_final(self):
l, s = (1, 1, 0, 'final', 0), 'anything_28_1_1_0'
self.assertEqual(l, Version.from_string(s))
def test_from_string_invalid_identifier(self):
self.assertRaises(VersionError, Version.from_string, '1.1.0dev')
self.assertRaises(VersionError, Version.from_string, '1.1.0devx')