Merge branch 'commitizen-tools:master' into commitizen-tools#572-LYC

Author: Cliying94

.pre-commit-config.yaml

@@ -46,7 +46,7 @@ repos:
         exclude: "poetry.lock"
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v3.21.2 # automatically updated by Commitizen
+    rev: v3.21.3 # automatically updated by Commitizen
     hooks:
       - id: commitizen
       - id: commitizen-branch

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v3.21.3 (2024-03-30)
+
+### Refactor
+
+- **defaults**: move cz_conventional_commit defaults out of defaults.py
+
 ## v3.21.2 (2024-03-30)
 
 ### Fix

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "3.21.2"
+__version__ = "3.21.3"

commitizen/cz/conventional_commits/conventional_commits.py

@@ -31,7 +31,7 @@ class ConventionalCommitsCz(BaseCommitizen):
     bump_pattern = defaults.bump_pattern
     bump_map = defaults.bump_map
     bump_map_major_version_zero = defaults.bump_map_major_version_zero
-    commit_parser = defaults.commit_parser
+    commit_parser = r"^((?P<change_type>feat|fix|refactor|perf|BREAKING CHANGE)(?:\((?P<scope>[^()\r\n]*)\)|\()?(?P<breaking>!)?|\w+!):\s(?P<message>.*)?"  # noqa
     change_type_map = {
         "feat": "Feat",
         "fix": "Fix",

commitizen/defaults.py

@@ -133,5 +133,3 @@ class Settings(TypedDict, total=False):
 )
 change_type_order = ["BREAKING CHANGE", "Feat", "Fix", "Refactor", "Perf"]
 bump_message = "bump: version $current_version → $new_version"
-
-commit_parser = r"^((?P<change_type>feat|fix|refactor|perf|BREAKING CHANGE)(?:\((?P<scope>[^()\r\n]*)\)|\()?(?P<breaking>!)?|\w+!):\s(?P<message>.*)?"  # noqa

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.commitizen]
-version = "3.21.2"
+version = "3.21.3"
 tag_format = "v$version"
 version_files = [
   "pyproject.toml:version",
@@ -9,7 +9,7 @@ version_files = [
 
 [tool.poetry]
 name = "commitizen"
-version = "3.21.2"
+version = "3.21.3"
 description = "Python commitizen client tool"
 authors = ["Santiago Fraire <[email protected]>"]
 license = "MIT"

tests/test_changelog.py

@@ -6,7 +6,7 @@
 import pytest
 from jinja2 import FileSystemLoader
 
-from commitizen import changelog, defaults, git
+from commitizen import changelog, git
 from commitizen.cz.conventional_commits.conventional_commits import (
     ConventionalCommitsCz,
 )
@@ -1079,8 +1079,8 @@ def test_invalid_tag_included_in_changelog():
 
 @pytest.mark.parametrize("merge_prereleases", (True, False))
 def test_generate_tree_from_commits(gitcommits, tags, merge_prereleases):
-    parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    parser = ConventionalCommitsCz.commit_parser
+    changelog_pattern = ConventionalCommitsCz.bump_pattern
     tree = changelog.generate_tree_from_commits(
         gitcommits, tags, parser, changelog_pattern, merge_prerelease=merge_prereleases
     )
@@ -1106,8 +1106,8 @@ def test_generate_tree_from_commits(gitcommits, tags, merge_prereleases):
 
 def test_generate_tree_from_commits_with_no_commits(tags):
     gitcommits = []
-    parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    parser = ConventionalCommitsCz.commit_parser
+    changelog_pattern = ConventionalCommitsCz.bump_pattern
     tree = changelog.generate_tree_from_commits(
         gitcommits, tags, parser, changelog_pattern
     )