no-mistakes(review): Reject string NONE in bump maps

Author: bearomorphism

commitizen/version_increment.py

@@ -58,12 +58,13 @@ def _from_bump_map_value(cls, value: object) -> VersionIncrement:
         """
         if value is None:
             return cls.NONE
-        if not isinstance(value, str):
-            raise ValueError(f"Invalid bump increment: {value!r}")
-        try:
-            return cls[value]
-        except KeyError as exc:
-            raise ValueError(f"Invalid bump increment: {value!r}") from exc
+        if value == "PATCH":
+            return cls.PATCH
+        if value == "MINOR":
+            return cls.MINOR
+        if value == "MAJOR":
+            return cls.MAJOR
+        raise ValueError(f"Invalid bump increment: {value!r}")
 
     @classmethod
     def from_match(

tests/commands/test_bump_command.py

@@ -1346,11 +1346,11 @@ def test_bump_allow_no_commit_with_invalid_custom_bump_map_raises(
             version = "0.1.0"
 
             [tool.commitizen.customize]
-            bump_pattern = "^(new|fix|docs)"
-            bump_map = { new = "MINORR", fix = "PATCH", docs = "NONE" }
-            change_type_map = { new = "Features", fix = "Bugs", docs = "Docs" }
-            changelog_pattern = "^(new|fix|docs)"
-            commit_parser = '^(?P<change_type>new|fix|docs):\\s(?P<message>.+)$'
+            bump_pattern = "^(new|fix)"
+            bump_map = { new = "MINORR", fix = "PATCH" }
+            change_type_map = { new = "Features", fix = "Bugs" }
+            changelog_pattern = "^(new|fix)"
+            commit_parser = '^(?P<change_type>new|fix):\\s(?P<message>.+)$'
             schema_pattern = ".*"
             questions = []
             """
@@ -1369,6 +1369,45 @@ def test_bump_allow_no_commit_with_invalid_custom_bump_map_raises(
     assert git.tag_exist("0.1.2") is False
 
 
+
+def test_bump_allow_no_commit_with_string_none_bump_map_raises(
+    tmp_commitizen_project: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    util: UtilFixture,
+) -> None:
+    """A matched bump-map string NONE must fail instead of falling back to PATCH."""
+    monkeypatch.chdir(tmp_commitizen_project)
+    (tmp_commitizen_project / "pyproject.toml").write_text(
+        dedent(
+            """
+            [tool.commitizen]
+            name = "cz_customize"
+            version = "0.1.0"
+
+            [tool.commitizen.customize]
+            bump_pattern = "^(docs|fix)"
+            bump_map = { docs = "NONE", fix = "PATCH" }
+            change_type_map = { docs = "Docs", fix = "Bugs" }
+            changelog_pattern = "^(docs|fix)"
+            commit_parser = '^(?P<change_type>docs|fix):\\s(?P<message>.+)$'
+            schema_pattern = ".*"
+            questions = []
+            """
+        ).strip()
+        + "\n",
+        encoding="utf-8",
+    )
+
+    util.create_file_and_commit("fix: seed release")
+    util.run_cli("bump", "--yes")
+    util.create_file_and_commit("docs: update guide")
+
+    with pytest.raises(ValueError, match="NONE"):
+        util.run_cli("bump", "--yes", "--allow-no-commit")
+
+    assert git.tag_exist("0.1.2") is False
+
+
 def test_bump_allow_no_commit_with_increment(
     tmp_commitizen_project, monkeypatch, util: UtilFixture, capsys
 ):

tests/test_version_increment.py

@@ -222,6 +222,17 @@ def test_get_highest_by_messages_supports_custom_none_mapping() -> None:
 
 
 
+def test_get_highest_by_messages_rejects_string_none_mapping() -> None:
+    """The string NONE remains invalid at the bump-map computation boundary."""
+    with pytest.raises(ValueError, match="NONE"):
+        VersionIncrement.get_highest_by_messages(
+            ["docs: update guide"],
+            r"^(docs)",
+            {"docs": "NONE"},
+        )
+
+
+
 def test_from_message_stops_after_major_match() -> None:
     """A major match on one line shields later invalid lines in that message."""
     assert (