Merge branch 'master' into feature/custom-validation

Author: benediktziegler

.github/workflows/pythonpackage.yml

@@ -6,7 +6,7 @@ jobs:
   python-check:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         platform: [ubuntu-20.04, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.pre-commit-config.yaml

@@ -49,7 +49,7 @@ repos:
           - tomli
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v3.31.0 # automatically updated by Commitizen
+    rev: v4.0.0 # automatically updated by Commitizen
     hooks:
       - id: commitizen
       - id: commitizen-branch

CHANGELOG.md

@@ -1,3 +1,5 @@
+## v4.0.0 (2024-11-26)
+
 ## v3.31.0 (2024-11-16)
 
 ### Feat

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "3.31.0"
+__version__ = "4.0.0"

commitizen/changelog.py

@@ -29,9 +29,10 @@
 
 import re
 from collections import OrderedDict, defaultdict
+from collections.abc import Iterable
 from dataclasses import dataclass
 from datetime import date
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 
 from jinja2 import (
     BaseLoader,

commitizen/changelog_formats/restructuredtext.py

@@ -3,7 +3,7 @@
 import re
 import sys
 from itertools import zip_longest
-from typing import IO, TYPE_CHECKING, Any, Tuple, Union
+from typing import IO, TYPE_CHECKING, Any, Union
 
 from commitizen.changelog import Metadata
 
@@ -18,7 +18,7 @@
 
 
 # Can't use `|` operator and native type because of https://bugs.python.org/issue42233 only fixed in 3.10
-TitleKind: TypeAlias = Union[str, Tuple[str, str]]
+TitleKind: TypeAlias = Union[str, tuple[str, str]]
 
 
 class RestructuredText(BaseFormat):

commitizen/cli.py

@@ -3,11 +3,12 @@
 import argparse
 import logging
 import sys
+from collections.abc import Sequence
 from copy import deepcopy
 from functools import partial
 from pathlib import Path
 from types import TracebackType
-from typing import Any, Sequence
+from typing import Any
 
 import argcomplete
 from decli import cli

commitizen/cz/__init__.py

@@ -4,7 +4,7 @@
 import pkgutil
 import sys
 import warnings
-from typing import Iterable
+from collections.abc import Iterable
 
 if sys.version_info >= (3, 10):
     from importlib import metadata

commitizen/cz/base.py

@@ -2,7 +2,8 @@
 
 import re
 from abc import ABCMeta, abstractmethod
-from typing import Any, Callable, Iterable, NamedTuple, Protocol
+from collections.abc import Iterable
+from typing import Any, Callable, NamedTuple, Protocol
 
 from jinja2 import BaseLoader, PackageLoader
 from prompt_toolkit.styles import Style, merge_styles

commitizen/defaults.py

@@ -2,7 +2,8 @@
 
 import pathlib
 from collections import OrderedDict
-from typing import Any, Iterable, MutableMapping, TypedDict
+from collections.abc import Iterable, MutableMapping
+from typing import Any, TypedDict
 
 # Type
 Questions = Iterable[MutableMapping[str, Any]]