This commit is contained in:
Manuel Barkhau 2022-06-04 23:25:40 +00:00 committed by mbarkhau
parent da44922261
commit ad837c09dd
3 changed files with 74 additions and 74 deletions

View file

@ -75,14 +75,14 @@ PART_PATTERNS = {
'VV': r"5[0-3]|[1-4][0-9]|[1-9]",
'0V': r"5[0-3]|[1-4][0-9]|0[1-9]",
# non calver parts
'MAJOR': r"[0-9]+",
'MINOR': r"[0-9]+",
'PATCH': r"[0-9]+",
'BUILD': r"[0-9]+",
'MAJOR' : r"[0-9]+",
'MINOR' : r"[0-9]+",
'PATCH' : r"[0-9]+",
'BUILD' : r"[0-9]+",
'BLD' : r"[1-9][0-9]*",
'TAG' : r"preview|final|alpha|beta|post|rc",
'PYTAG': r"post|rc|a|b",
'GITHASH' : r"\.[0-9]+\+.*",
'PYTAG' : r"post|rc|a|b",
'GITHASH': r"\.[0-9]+\+.*",
'NUM' : r"[0-9]+",
'INC0' : r"[0-9]+",
'INC1' : r"[1-9][0-9]*",
@ -103,14 +103,14 @@ PATTERN_PART_FIELDS = {
'0D' : 'dom',
'JJJ' : 'doy',
'00J' : 'doy',
'MAJOR': 'major',
'MINOR': 'minor',
'PATCH': 'patch',
'BUILD': 'bid',
'MAJOR' : 'major',
'MINOR' : 'minor',
'PATCH' : 'patch',
'BUILD' : 'bid',
'BLD' : 'bid',
'TAG' : 'tag',
'PYTAG': 'pytag',
'GITHASH' : 'githash',
'PYTAG' : 'pytag',
'GITHASH': 'githash',
'NUM' : 'num',
'INC0' : 'inc0',
'INC1' : 'inc1',
@ -203,14 +203,14 @@ PART_FORMATS: typ.Dict[str, FormatterFunc] = {
'0D' : _fmt_0d,
'JJJ' : _fmt_num,
'00J' : _fmt_00j,
'MAJOR': _fmt_num,
'MINOR': _fmt_num,
'PATCH': _fmt_num,
'BUILD': _fmt_num,
'MAJOR' : _fmt_num,
'MINOR' : _fmt_num,
'PATCH' : _fmt_num,
'BUILD' : _fmt_num,
'BLD' : _fmt_bld,
'TAG' : _fmt_num,
'PYTAG': _fmt_num,
'GITHASH' : _fmt_num,
'PYTAG' : _fmt_num,
'GITHASH': _fmt_num,
'NUM' : _fmt_num,
'INC0' : _fmt_num,
'INC1' : _fmt_num,

View file

@ -222,7 +222,7 @@ def parse_field_values_to_vinfo(field_values: FieldValues) -> version.V2VersionI
fvals = field_values
tag = fvals.get('tag' ) or ""
pytag = fvals.get('pytag') or ""
pytag = fvals.get('pytag' ) or ""
githash = fvals.get('githash') or ""
if tag and not pytag:

View file

@ -77,7 +77,7 @@ class V2VersionInfo(typ.NamedTuple):
bid : str
tag : str
pytag : str
githash : str
githash: str
num : int
inc0 : int
inc1 : int