Skip to content

refactor(tags): extract version resolution method #1839

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

Open
bearomorphism wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(tags): extract version resolution method #1839

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 22 additions & 25 deletions commitizen/tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,24 +154,13 @@ def extract_version(self, tag: GitTag) -> Version:
candidates = (
m for regex in self.version_regexes if (m := regex.fullmatch(tag.name))
)
if not (m := next(candidates, None)):
if not (match := next(candidates, None)):
raise InvalidVersion(self._version_tag_error(tag.name))
if "version" in m.groupdict():
return self.scheme(m.group("version"))

parts = m.groupdict()
version = parts["major"]
if version := match.groupdict().get("version"):
return self.scheme(version)

if minor := parts.get("minor"):
version = f"{version}.{minor}"
if patch := parts.get("patch"):
version = f"{version}.{patch}"

if parts.get("prerelease"):
version = f"{version}-{parts['prerelease']}"
if parts.get("devrelease"):
version = f"{version}{parts['devrelease']}"
return self.scheme(version)
return self.scheme(self._extract_version_parts(match))

def include_in_changelog(self, tag: GitTag) -> bool:
"""Check if a tag should be included in the changelog"""
Expand All @@ -195,19 +184,14 @@ def search_version(self, text: str, last: bool = False) -> VersionTag | None:

match = matches[-1 if last else 0]

if "version" in match.groupdict():
return VersionTag(match.group("version"), match.group(0))
groups = match.groupdict()
if version := groups.get("version"):
return VersionTag(version, match.group(0))

parts = match.groupdict()
try:
version = f"{parts['major']}.{parts['minor']}.{parts['patch']}"
except KeyError:
if not all(value in groups for value in ["major", "minor", "patch"]):
return None

if parts.get("prerelease"):
version = f"{version}-{parts['prerelease']}"
if parts.get("devrelease"):
version = f"{version}{parts['devrelease']}"
version = self._extract_version_parts(match)
return VersionTag(version, match.group(0))

def normalize_tag(
Expand Down Expand Up @@ -284,3 +268,16 @@ def from_settings(cls, settings: Settings) -> Self:
ignored_tag_formats=settings["ignored_tag_formats"],
merge_prereleases=settings["changelog_merge_prerelease"],
)

def _extract_version_parts(self, match: re.Match[str]) -> str:
groups = match.groupdict()
parts: list[str] = [groups["major"]]
if minor := groups.get("minor"):
parts.append(f".{minor}")
if patch := groups.get("patch"):
parts.append(f".{patch}")
if prerelease := groups.get("prerelease"):
parts.append(f"-{prerelease}")
if devrelease := groups.get("devrelease"):
parts.append(devrelease)
return "".join(parts)