Merge branch 'master' into bump-rule-interface

Author: bearomorphism

.pre-commit-config.yaml

@@ -48,7 +48,7 @@ repos:
           - tomli
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.7.1 # automatically updated by Commitizen
+    rev: v4.7.2 # automatically updated by Commitizen
     hooks:
       - id: commitizen
       - id: commitizen-branch

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v4.7.2 (2025-05-18)
+
+### Refactor
+
+- **default**: capitalize all constants and remove unnecessary variable
+
 ## v4.7.1 (2025-05-16)
 
 ### Fix

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "4.7.1"
+__version__ = "4.7.2"

commitizen/bump.py

@@ -5,7 +5,7 @@
 from glob import iglob
 from string import Template
 
-from commitizen.defaults import bump_message, encoding
+from commitizen.defaults import BUMP_MESSAGE, ENCODING
 from commitizen.exceptions import CurrentVersionNotFoundError
 from commitizen.git import smart_open
 from commitizen.version_schemes import Version
@@ -17,7 +17,7 @@ def update_version_in_files(
     files: list[str],
     *,
     check_consistency: bool = False,
-    encoding: str = encoding,
+    encoding: str = ENCODING,
 ) -> list[str]:
     """Change old version to the new one in every file given.
 
@@ -74,7 +74,7 @@ def _bump_with_regex(
     current_version: str,
     new_version: str,
     regex: str,
-    encoding: str = encoding,
+    encoding: str = ENCODING,
 ) -> tuple[bool, str]:
     current_version_found = False
     lines = []
@@ -101,6 +101,6 @@ def create_commit_message(
     message_template: str | None = None,
 ) -> str:
     if message_template is None:
-        message_template = bump_message
+        message_template = BUMP_MESSAGE
     t = Template(message_template)
     return t.safe_substitute(current_version=current_version, new_version=new_version)

commitizen/commands/changelog.py

@@ -78,7 +78,7 @@ def __init__(self, config: BaseConfig, args):
         self.change_type_order = (
             self.config.settings.get("change_type_order")
             or self.cz.change_type_order
-            or defaults.change_type_order
+            or defaults.CHANGE_TYPE_ORDER
         )
         self.rev_range = args.get("rev_range")
         self.tag_format: str = (

commitizen/commands/init.py

@@ -11,7 +11,7 @@
 from commitizen.__version__ import __version__
 from commitizen.config import BaseConfig, JsonConfig, TomlConfig, YAMLConfig
 from commitizen.cz import registry
-from commitizen.defaults import DEFAULT_SETTINGS, config_files
+from commitizen.defaults import CONFIG_FILES, DEFAULT_SETTINGS
 from commitizen.exceptions import InitFailedError, NoAnswersError
 from commitizen.git import get_latest_tag_name, get_tag_names, smart_open
 from commitizen.version_schemes import KNOWN_SCHEMES, Version, get_version_scheme
@@ -165,7 +165,7 @@ def _ask_config_path(self) -> str:
 
         name: str = questionary.select(
             "Please choose a supported config file: ",
-            choices=config_files,
+            choices=CONFIG_FILES,
             default=default_path,
             style=self.cz.style,
         ).unsafe_ask()

commitizen/config/__init__.py

@@ -28,7 +28,7 @@ def read_cfg(filepath: str | None = None) -> BaseConfig:
         cfg_paths = (
             path / Path(filename)
             for path in cfg_search_paths
-            for filename in defaults.config_files
+            for filename in defaults.CONFIG_FILES
         )
 
     for filename in cfg_paths:

commitizen/cz/customize/customize.py

@@ -24,7 +24,7 @@ class CustomizeCommitsCz(BaseCommitizen):
     bump_pattern = defaults.BUMP_PATTERN
     bump_map = defaults.BUMP_MAP
     bump_map_major_version_zero = defaults.BUMP_MAP_MAJOR_VERSION_ZERO
-    change_type_order = defaults.change_type_order
+    change_type_order = defaults.CHANGE_TYPE_ORDER
 
     def __init__(self, config: BaseConfig):
         super().__init__(config)

commitizen/defaults.py

@@ -62,8 +62,7 @@ class Settings(TypedDict, total=False):
     extras: dict[str, Any]
 
 
-name: str = "cz_conventional_commits"
-config_files: list[str] = [
+CONFIG_FILES: list[str] = [
     "pyproject.toml",
     ".cz.toml",
     ".cz.json",
@@ -72,10 +71,10 @@ class Settings(TypedDict, total=False):
     "cz.yaml",
     "cz.toml",
 ]
-encoding: str = "utf-8"
+ENCODING = "utf-8"
 
 DEFAULT_SETTINGS: Settings = {
-    "name": name,
+    "name": "cz_conventional_commits",
     "version": None,
     "version_files": [],
     "version_provider": "commitizen",
@@ -104,7 +103,7 @@ class Settings(TypedDict, total=False):
     "pre_bump_hooks": [],
     "post_bump_hooks": [],
     "prerelease_offset": 0,
-    "encoding": encoding,
+    "encoding": ENCODING,
     "always_signoff": False,
     "template": None,  # default provided by plugin
     "extras": {},
@@ -113,7 +112,7 @@ class Settings(TypedDict, total=False):
 CHANGELOG_FORMAT = "markdown"
 
 BUMP_PATTERN = r"^((BREAKING[\-\ ]CHANGE|\w+)(\(.+\))?!?):"
-BUMP_MAP = dict(
+BUMP_MAP = OrderedDict(
     (
         (r"^.+!$", str(SemVerIncrement.MAJOR)),
         (r"^BREAKING[\-\ ]CHANGE", str(SemVerIncrement.MAJOR)),
@@ -123,7 +122,7 @@ class Settings(TypedDict, total=False):
         (r"^perf", str(SemVerIncrement.PATCH)),
     )
 )
-BUMP_MAP_MAJOR_VERSION_ZERO = dict(
+BUMP_MAP_MAJOR_VERSION_ZERO = OrderedDict(
     (
         (r"^.+!$", str(SemVerIncrement.MINOR)),
         (r"^BREAKING[\-\ ]CHANGE", str(SemVerIncrement.MINOR)),
@@ -133,8 +132,8 @@ class Settings(TypedDict, total=False):
         (r"^perf", str(SemVerIncrement.PATCH)),
     )
 )
-change_type_order = ["BREAKING CHANGE", "Feat", "Fix", "Refactor", "Perf"]
-bump_message = "bump: version $current_version → $new_version"
+CHANGE_TYPE_ORDER = ["BREAKING CHANGE", "Feat", "Fix", "Refactor", "Perf"]
+BUMP_MESSAGE = "bump: version $current_version → $new_version"
 
 
 def get_tag_regexes(

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commitizen"
-version = "4.7.1"
+version = "4.7.2"
 description = "Python commitizen client tool"
 authors = [{ name = "Santiago Fraire", email = "[email protected]" }]
 maintainers = [
@@ -88,7 +88,7 @@ build-backend = "poetry.core.masonry.api"
 
 
 [tool.commitizen]
-version = "4.7.1"
+version = "4.7.2"
 tag_format = "v$version"
 version_files = [
     "pyproject.toml:version",

tests/test_conf.py

@@ -151,7 +151,7 @@ def test_find_git_project_root(tmpdir):
 
 
 @pytest.mark.parametrize(
-    "config_files_manager", defaults.config_files.copy(), indirect=True
+    "config_files_manager", defaults.CONFIG_FILES.copy(), indirect=True
 )
 def test_set_key(config_files_manager):
     _conf = config.read_cfg()
@@ -162,7 +162,7 @@ def test_set_key(config_files_manager):
 
 class TestReadCfg:
     @pytest.mark.parametrize(
-        "config_files_manager", defaults.config_files.copy(), indirect=True
+        "config_files_manager", defaults.CONFIG_FILES.copy(), indirect=True
     )
     def test_load_conf(_, config_files_manager):
         cfg = config.read_cfg()