openstack/deb-python-semantic-version
Code Issues Proposed changes

Add support for compatible release ranges, fixes #37

Browse Source
This commit is contained in:
Martin Ek
2016-02-23 23:24:32 +01:00
parent d10ab4cb1d
commit 0c96767bd3
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
semantic_version/base.py
View File

@@ -405,6 +405,7 @@ class SpecItem(object):
KIND_NEQ = '!='
KIND_CARET = '^'
KIND_TILDE = '~'
KIND_COMPATIBLE = '~='
# Map a kind alias to its full version
KIND_ALIASES = {
@@ -412,7 +413,7 @@ class SpecItem(object):
KIND_EMPTY: KIND_EQUAL,
}
re_spec = re.compile(r'^(<|<=||=|==|>=|>|!=|\^|~)(\d.*)$')
re_spec = re.compile(r'^(<|<=||=|==|>=|>|!=|\^|~|~=)(\d.*)$')
def __init__(self, requirement_string):
kind, spec = self.parse(requirement_string)
@@ -468,6 +469,12 @@ class SpecItem(object):
return self.spec <= version < upper
elif self.kind == self.KIND_TILDE:
return self.spec <= version < self.spec.next_minor()
elif self.kind == self.KIND_COMPATIBLE:
if self.spec.patch:
upper = self.spec.next_minor()
else:
upper = self.spec.next_major()
return self.spec <= version < upper
else: # pragma: no cover
raise ValueError('Unexpected match kind: %r' % self.kind)

8
tests/test_base.py
View File

@@ -514,6 +514,14 @@ class SpecItemTestCase(unittest.TestCase):
['0.0.2', '0.0.2-alpha', '0.0.2+abb'],
['0.1.0', '0.0.3', '1.0.0'],
),
'~=1.4.5': (
['1.4.5', '1.4.10-alpha', '1.4.10'],
['1.3.6', '1.4.4', '1.5.0'],
),
'~=1.4': (
['1.4.0', '1.6.10-alpha', '1.6.10'],
['1.3.0', '2.0.0'],
),
}
def test_matches(self):

11
tests/test_match.py
View File

@@ -31,6 +31,7 @@ class MatchTestCase(unittest.TestCase):
'!=0.1.2-rc1.3-14.15+build.2012-01-01.11h34',
'^0.1.2',
'~0.1.2',
'~=0.1.2',
]
matches = {
@@ -113,6 +114,16 @@ class MatchTestCase(unittest.TestCase):
'0.1.2+build4.5',
'0.1.3-rc1.3',
],
'~=1.4.5': (
'1.4.5',
'1.4.10-alpha',
'1.4.10',
),
'~=1.4': [
'1.4.0',
'1.6.10-alpha',
'1.6.10',
],
}
def test_invalid(self):