From 7b49f8ad524d48f8c9cf7ca815faa3dc692b577d Mon Sep 17 00:00:00 2001
From: itinghung <itinghung.tina@gmail.com>
Date: Sat, 30 Mar 2024 16:10:15 +0800
Subject: [PATCH 1/2] refactor(defaults): move cz_conventional_commit defaults
 out of defaults.py

---
 .../cz/conventional_commits/conventional_commits.py    |  2 +-
 commitizen/defaults.py                                 |  2 --
 tests/test_changelog.py                                | 10 +++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/commitizen/cz/conventional_commits/conventional_commits.py b/commitizen/cz/conventional_commits/conventional_commits.py
index f927a94fdd..5f693963e7 100644
--- a/commitizen/cz/conventional_commits/conventional_commits.py
+++ b/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",
diff --git a/commitizen/defaults.py b/commitizen/defaults.py
index 071efd10b9..a1651ebe88 100644
--- a/commitizen/defaults.py
+++ b/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
diff --git a/tests/test_changelog.py b/tests/test_changelog.py
index 9ccc207936..d382a67f30 100644
--- a/tests/test_changelog.py
+++ b/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
     )

From 669080c8c180a1f81bc3f0666b0d49fb71ab6dde Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 30 Mar 2024 09:15:00 +0000
Subject: [PATCH 2/2] =?UTF-8?q?bump:=20version=203.21.2=20=E2=86=92=203.21?=
 =?UTF-8?q?.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .pre-commit-config.yaml   | 2 +-
 CHANGELOG.md              | 6 ++++++
 commitizen/__version__.py | 2 +-
 pyproject.toml            | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a07b16ca20..5c9623149e 100644
--- a/.pre-commit-config.yaml
+++ b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82e455c569..a3daec51cd 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/commitizen/__version__.py b/commitizen/__version__.py
index 6a2d1c0215..322a27ea54 100644
--- a/commitizen/__version__.py
+++ b/commitizen/__version__.py
@@ -1 +1 @@
-__version__ = "3.21.2"
+__version__ = "3.21.3"
diff --git a/pyproject.toml b/pyproject.toml
index d250e274af..d1e03c436e 100644
--- a/pyproject.toml
+++ b/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 <santiwilly@gmail.com>"]
 license = "MIT"