technofab/bumpver
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/bumpver.git synced 2025-12-12 14:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes for new pattern formatting

Browse source
This commit is contained in:
Manuel Barkhau 2020-09-24 20:33:27 +00:00
parent e237c4a7e2
commit ada75ade8a
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pycalver/v2version.py
View file

@ -249,6 +249,12 @@ def parse_version_info(
f"for pattern '{raw_pattern}'/'{pattern.regexp.pattern}'" f"for pattern '{raw_pattern}'/'{pattern.regexp.pattern}'"
) )
raise version.PatternError(err_msg) raise version.PatternError(err_msg)
elif len(match.group()) < len(version_str):
err_msg = (
f"Incomplete match '{match.group()}' for version string '{version_str}' "
f"with pattern '{raw_pattern}'/'{pattern.regexp.pattern}'"
)
raise version.PatternError(err_msg)
else: else:
field_values = match.groupdict() field_values = match.groupdict()
return _parse_version_info(field_values) return _parse_version_info(field_values)
@ -389,9 +395,8 @@ def _format_segment_tree(
if isinstance(seg, list): if isinstance(seg, list):
result_parts.extend(_format_segment_tree(seg, part_values)) result_parts.extend(_format_segment_tree(seg, part_values))
else: else:
# NOTE (mb 2020-09-24): If a segment has any zero parts, # If a segment has any non-zero parts, the whole segment is used.
# the whole segment is skipped. non_zero_parts = 0
is_zero_seg = False
formatted_seg = seg formatted_seg = seg
# unescape braces # unescape braces
formatted_seg = formatted_seg.replace(r"\[", r"[") formatted_seg = formatted_seg.replace(r"\[", r"[")
@ -403,11 +408,12 @@ def _format_segment_tree(
part in version.ZERO_VALUES and str(part_value) == version.ZERO_VALUES[part] part in version.ZERO_VALUES and str(part_value) == version.ZERO_VALUES[part]
) )
if is_zero_part: if is_zero_part:
is_zero_seg = True formatted_seg = formatted_seg.replace(part, "")
else: else:
non_zero_parts += 1
formatted_seg = formatted_seg.replace(part, part_value) formatted_seg = formatted_seg.replace(part, part_value)
if not is_zero_seg: if non_zero_parts:
result_parts.append(formatted_seg) result_parts.append(formatted_seg)
return result_parts return result_parts
@ -507,7 +513,7 @@ def format_version(vinfo: version.V2VersionInfo, raw_pattern: str) -> str:
def incr( def incr(
old_version: str, old_version: str,
raw_pattern: str = "vYYYY0M.BUILD[-RELEASE]", raw_pattern: str = "vYYYY0M.BUILD[-RELEASE[NUM]]",
*, *,
release : typ.Optional[str] = None, release : typ.Optional[str] = None,
major : bool = False, major : bool = False,