refactor(defaults): move cz_conventional_commit defaults out of defau…

…lts.py
commitizen-tools · Mar 30, 2024 · 7b49f8a · 7b49f8a
1 parent 8d5f630
commit 7b49f8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
  )