Commit ba5e539

committed

fix: ignore invalid tags

Starting in 4.4.0 due to commitizen-tools#1297 when an invalid tag is present an exception is thrown This commit ignores the invalid tags Follow up from commitizen-tools#1375

1 parent 617b610 commit ba5e539Copy full SHA for ba5e539

File tree

2 files changed

+10

-1

lines changed

commitizen/providers
- scm_provider.py
tests/providers
- test_scm_provider.py

2 files changed

+10

-1

lines changed

`‎commitizen/providers/scm_provider.py‎`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`from __future__ import annotations`
`2`	`2`
	`3`	`+from packaging.version import InvalidVersion`
	`4`	`+`
`3`	`5`	`from commitizen.git import get_tags`
`4`	`6`	`from commitizen.providers.base_provider import VersionProvider`
`5`	`7`	`from commitizen.tags import TagRules`
`@@ -18,7 +20,13 @@ def get_version(self) -> str:`
`18`	`20`	`rules = TagRules.from_settings(self.config.settings)`
`19`	`21`	`tags = get_tags(reachable_only=True)`
`20`	`22`	`version_tags = rules.get_version_tags(tags)`
`21`		`- versions = sorted(rules.extract_version(t) for t in version_tags)`
	`23`	`+ versions = []`
	`24`	`+ for t in version_tags:`
	`25`	`+ try:`
	`26`	`+ versions.append(rules.extract_version(t))`
	`27`	`+ except InvalidVersion:`
	`28`	`+ continue`
	`29`	`+ versions = sorted(versions)`
`22`	`30`	`if not versions:`
`23`	`31`	`return "0.0.0"`
`24`	`32`	`return str(versions[-1])`

`‎tests/providers/test_scm_provider.py‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`("$version", "0.1.0", "0.1.0"),`
`24`	`24`	`("$version", "v0.1.0", "0.1.0"),`
`25`	`25`	`("$version", "v-0.1.0", "0.0.0"),`
	`26`	`+ ("$version", "1.0.0.xxxx", "0.0.0"),`
`26`	`27`	`# If tag_format is not None or $version, TAG_FORMAT_REGEXS are used, which are`
`27`	`28`	`# much more lenient but require a v prefix.`
`28`	`29`	`("v$version", "v0.1.0", "0.1.0"),`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ba5e539

File tree

2 files changed

2 files changed

`‎commitizen/providers/scm_provider.py‎`

`‎tests/providers/test_scm_provider.py‎`

0 commit comments