Skip to content

(not semver) add two match model for '~' and '^' #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chinakids wants to merge 4 commits into from
Closed

(not semver) add two match model for '~' and '^' #25

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e6c653
Update semver.py
Mar 18, 2016
fb1108f
Update semver.py
Mar 18, 2016
d482af2
Update semver.py
Mar 18, 2016
4290c7b
Update semver.py
Mar 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions semver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# -*- coding: utf-8 -*-

import re
Expand Down Expand Up @@ -68,7 +69,7 @@ def match(version, match_expr):
prefix = match_expr[:2]
if prefix in ('>=', '<=', '=='):
match_version = match_expr[2:]
elif prefix and prefix[0] in ('>', '<', '='):
elif prefix and prefix[0] in ('>', '<', '=', '~', '^'):
prefix = prefix[0]
match_version = match_expr[1:]
else:
Expand All @@ -81,13 +82,48 @@ def match(version, match_expr):
'<': (-1,),
'==': (0,),
'>=': (0, 1),
'<=': (-1, 0)
'<=': (-1, 0),
'~': (0, 1),
'^': (0, 1)
}

possibilities = possibilities_dict[prefix]

cmp_res = compare(version, match_version)

return cmp_res in possibilities
if prefix in ('^',):
if cmp_res in possibilities:
v = parse(match_version)
if v.get('major') is 0:
if v.get('minor') is 0:
cmp_res = compare(version, bump_patch(match_version))
if cmp_res in possibilities_dict['<']:
return True
else:
return False
else:
cmp_res = compare(version, bump_minor(match_version))
if cmp_res in possibilities_dict['<']:
return True
else:
return False
else:
cmp_res = compare(version, bump_major(match_version))
if cmp_res in possibilities_dict['<']:
return True
else:
return False
elif prefix in ('~',):
if cmp_res in possibilities:
cmp_res = compare(version, bump_minor(match_version))
if cmp_res in possibilities_dict['<']:
return True
else:
return False
else:
return False
else:
return cmp_res in possibilities


def max_ver(ver1, ver2):
Expand Down