Commit 34ba400

KyleKingLee-W

authored and

committed

refactor: raise an InvalidConfigurationError

1 parent 9d1a53e commit 34ba400Copy full SHA for 34ba400

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`from jinja2 import Environment, PackageLoader`
`35`	`35`
`36`	`36`	`from commitizen import defaults`
	`37`	`+from commitizen.exceptions import InvalidConfigurationError`
`37`	`38`	`from commitizen.git import GitCommit, GitTag`
`38`	`39`
`39`	`40`	`CATEGORIES = [`
`@@ -131,7 +132,7 @@ def generate_tree_from_commits(`
`131`	`132`
`132`	`133`	`def order_changelog_tree(tree: Iterable, change_type_order: List[str]) -> Iterable:`
`133`	`134`	`if len(set(change_type_order)) != len(change_type_order):`
`134`		`- raise RuntimeError(`
	`135`	`+ raise InvalidConfigurationError(`
`135`	`136`	`f"Change types contain duplicates types ({change_type_order})"`
`136`	`137`	`)`
`137`	`138`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class ExitCode(enum.IntEnum):`
`23`	`23`	`NO_REVISION = 16`
`24`	`24`	`CURRENT_VERSION_NOT_FOUND = 17`
`25`	`25`	`INVALID_COMMAND_ARGUMENT = 18`
	`26`	`+ INVALID_CONFIGURATION = 19`
`26`	`27`
`27`	`28`
`28`	`29`	`class CommitizenException(Exception):`
`@@ -137,3 +138,7 @@ class NoCommandFoundError(CommitizenException):`
`137`	`138`
`138`	`139`	`class InvalidCommandArgumentError(CommitizenException):`
`139`	`140`	`exit_code = ExitCode.INVALID_COMMAND_ARGUMENT`
	`141`	`+`
	`142`	`+`
	`143`	`+class InvalidConfigurationError(CommitizenException):`
	`144`	`+ exit_code = ExitCode.INVALID_CONFIGURATION`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -26,3 +26,4 @@ These exit codes can be found in `commitizen/exceptions.py::ExitCode`.
`26`	`26`	`\| NoRevisionError \| 16 \| No revision found \|`
`27`	`27`	`\| CurrentVersionNotFoundError \| 17 \| current version cannot be found in version_files \|`
`28`	`28`	\| InvalidCommandArgumentError \| 18 \| The argument provide to command is invalid (e.g. `cz check -commit-msg-file filename --rev-range master..`) \|
	`29`	+\| InvalidConfigurationError \| 19 \| An error was found in the Commitizen Configuration, such as duplicates in `change_type_order` \|

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import pytest`
`2`	`2`
`3`	`3`	`from commitizen import changelog, defaults, git`
	`4`	`+from commitizen.exceptions import InvalidConfigurationError`
`4`	`5`
`5`	`6`	`COMMITS_DATA = [`
`6`	`7`	`{`
`@@ -833,10 +834,10 @@ def test_order_changelog_tree(change_type_order, expected_reordering):`
`833`	`834`
`834`	`835`	`def test_order_changelog_tree_raises():`
`835`	`836`	`change_type_order = ["BREAKING CHANGE", "feat", "refactor", "feat"]`
`836`		`- with pytest.raises(RuntimeError) as excinfo:`
	`837`	`+ with pytest.raises(InvalidConfigurationError) as excinfo:`
`837`	`838`	`changelog.order_changelog_tree(COMMITS_TREE, change_type_order)`
`838`	`839`
`839`		`- assert " duplicate" in str(excinfo)`
	`840`	`+ assert "Change types contain duplicates types" in str(excinfo)`
`840`	`841`
`841`	`842`
`842`	`843`	`def test_render_changelog(gitcommits, tags, changelog_content):`

Comments

(0)