commitizen-tools · Lee-W · Jun 24, 2023 · May 16, 2023 · Jun 23, 2023 · Jun 23, 2023
@@ -30,14 +30,20 @@
 import re
 from collections import OrderedDict, defaultdict
 from datetime import date
-from typing import TYPE_CHECKING, Callable, Iterable, cast
+from typing import TYPE_CHECKING, Callable, Iterable, Type, cast

 from jinja2 import Environment, PackageLoader

+from commitizen import out
 from commitizen.bump import normalize_tag
 from commitizen.exceptions import InvalidConfigurationError, NoCommitsFoundError
 from commitizen.git import GitCommit, GitTag
-from commitizen.version_schemes import DEFAULT_SCHEME, Pep440, InvalidVersion
+from commitizen.version_schemes import (
+    DEFAULT_SCHEME,
+    BaseVersion,
+    InvalidVersion,
+    Pep440,
+)

 if TYPE_CHECKING:
    from commitizen.version_schemes import VersionScheme
@@ -67,6 +73,19 @@ def tag_included_in_changelog(
    return True


+def get_version_tags(scheme: Type[BaseVersion], tags: list[GitTag]) -> list[GitTag]:
+    valid_tags: list[GitTag] = []
+    for tag in tags:
+        try:
+            scheme(tag.name)
+        except InvalidVersion:
+            out.warn(f"InvalidVersion {tag}")
+        else:
+            valid_tags.append(tag)
+
+    return valid_tags
+
+
 def generate_tree_from_commits(
    commits: list[GitCommit],
    tags: list[GitTag],

@@ -137,12 +137,9 @@ def __call__(self):
        # Don't continue if no `file_name` specified.
        assert self.file_name

-        tags = git.get_tags()
-        if not tags:
-            tags = []
+        tags = changelog.get_version_tags(self.scheme, git.get_tags()) or []

        end_rev = ""
-
        if self.incremental:
            changelog_meta = changelog.get_metadata(self.file_name, self.scheme)
            latest_version = changelog_meta.get("latest_version")

@@ -92,11 +92,22 @@ def tag(tag: str, annotated: bool = False, signed: bool = False) -> cmd.Command:
    return c


-def commit(message: str, args: str = "") -> cmd.Command:
+def commit(
+    message: str, args: str = "", committer_date: str | None = None
+) -> cmd.Command:
    f = NamedTemporaryFile("wb", delete=False)
    f.write(message.encode("utf-8"))
    f.close()
-    c = cmd.run(f"git commit {args} -F {f.name}")
+
+    command = f"git commit {args} -F {f.name}"
+
+    if committer_date and os.name == "nt":  # pragma: no cover
+        # Using `cmd /v /c "{command}"` sets environment variables only for that command
+        command = f'cmd /v /c "set GIT_COMMITTER_DATE={committer_date}&& {command}"'
+    elif committer_date:
+        command = f"GIT_COMMITTER_DATE={committer_date} {command}"
+
+    c = cmd.run(command)
    os.unlink(f.name)
    return c


@@ -69,6 +69,9 @@ types-termcolor = "^0.1.1"
 # documentation
 mkdocs = "^1.4.2"
 mkdocs-material = "^9.1.6"
+deprecated = "^1.2.13"
+types-deprecated = "^1.2.9.2"
+types-python-dateutil = "^2.8.19.13"


 [tool.poetry.scripts]