Skip to content

Commit 7b49f8a

Browse files
ITingHungLee-W
authored andcommitted
refactor(defaults): move cz_conventional_commit defaults out of defaults.py
1 parent 8d5f630 commit 7b49f8a

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Diff for: commitizen/cz/conventional_commits/conventional_commits.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ConventionalCommitsCz(BaseCommitizen):
3131
bump_pattern = defaults.bump_pattern
3232
bump_map = defaults.bump_map
3333
bump_map_major_version_zero = defaults.bump_map_major_version_zero
34-
commit_parser = defaults.commit_parser
34+
commit_parser = r"^((?P<change_type>feat|fix|refactor|perf|BREAKING CHANGE)(?:\((?P<scope>[^()\r\n]*)\)|\()?(?P<breaking>!)?|\w+!):\s(?P<message>.*)?" # noqa
3535
change_type_map = {
3636
"feat": "Feat",
3737
"fix": "Fix",

Diff for: commitizen/defaults.py

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

Diff for: tests/test_changelog.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77
from jinja2 import FileSystemLoader
88

9-
from commitizen import changelog, defaults, git
9+
from commitizen import changelog, git
1010
from commitizen.cz.conventional_commits.conventional_commits import (
1111
ConventionalCommitsCz,
1212
)
@@ -1079,8 +1079,8 @@ def test_invalid_tag_included_in_changelog():
10791079

10801080
@pytest.mark.parametrize("merge_prereleases", (True, False))
10811081
def test_generate_tree_from_commits(gitcommits, tags, merge_prereleases):
1082-
parser = defaults.commit_parser
1083-
changelog_pattern = defaults.bump_pattern
1082+
parser = ConventionalCommitsCz.commit_parser
1083+
changelog_pattern = ConventionalCommitsCz.bump_pattern
10841084
tree = changelog.generate_tree_from_commits(
10851085
gitcommits, tags, parser, changelog_pattern, merge_prerelease=merge_prereleases
10861086
)
@@ -1106,8 +1106,8 @@ def test_generate_tree_from_commits(gitcommits, tags, merge_prereleases):
11061106

11071107
def test_generate_tree_from_commits_with_no_commits(tags):
11081108
gitcommits = []
1109-
parser = defaults.commit_parser
1110-
changelog_pattern = defaults.bump_pattern
1109+
parser = ConventionalCommitsCz.commit_parser
1110+
changelog_pattern = ConventionalCommitsCz.bump_pattern
11111111
tree = changelog.generate_tree_from_commits(
11121112
gitcommits, tags, parser, changelog_pattern
11131113
)

0 commit comments

Comments
 (0)