feat(customize.py/test_cz_customize.py): inherit from ConventionalCommitsCz directly

enable cz_customize default behavior follow ConventionalCommitsCz without trivial settings

Author: AtticusZeller

commitizen/cz/customize/customize.py

@@ -1,26 +1,21 @@
 from __future__ import annotations
 
+from commitizen.cz.conventional_commits import ConventionalCommitsCz
+
 try:
     from jinja2 import Template
 except ImportError:
     from string import Template  # type: ignore
 
 
-from commitizen import defaults
 from commitizen.config import BaseConfig
-from commitizen.cz.base import BaseCommitizen
 from commitizen.defaults import Questions
 from commitizen.exceptions import MissingCzCustomizeConfigError
 
 __all__ = ["CustomizeCommitsCz"]
 
 
-class CustomizeCommitsCz(BaseCommitizen):
-    bump_pattern = defaults.bump_pattern
-    bump_map = defaults.bump_map
-    bump_map_major_version_zero = defaults.bump_map_major_version_zero
-    change_type_order = defaults.change_type_order
-
+class CustomizeCommitsCz(ConventionalCommitsCz):
     def __init__(self, config: BaseConfig):
         super().__init__(config)
 
@@ -59,25 +54,40 @@ def __init__(self, config: BaseConfig):
             self.change_type_map = change_type_map
 
     def questions(self) -> Questions:
-        return self.custom_settings.get("questions", [{}])
+        custom_questions = self.custom_settings.get("questions", [{}])
+        if custom_questions:
+            return custom_questions
+        return super().questions()
 
     def message(self, answers: dict) -> str:
-        message_template = Template(self.custom_settings.get("message_template", ""))
-        if getattr(Template, "substitute", None):
-            return message_template.substitute(**answers)  # type: ignore
-        else:
-            return message_template.render(**answers)
-
-    def example(self) -> str | None:
-        return self.custom_settings.get("example")
-
-    def schema_pattern(self) -> str | None:
-        return self.custom_settings.get("schema_pattern")
-
-    def schema(self) -> str | None:
-        return self.custom_settings.get("schema")
-
-    def info(self) -> str | None:
+        custom_message = self.custom_settings.get("message_template")
+        if custom_message:
+            message_template = Template(custom_message)
+            if getattr(Template, "substitute", None):
+                return message_template.substitute(**answers)  # type: ignore
+            else:
+                return message_template.render(**answers)
+        return super().message(answers)
+
+    def example(self) -> str:
+        custom_example = self.custom_settings.get("example")
+        if custom_example:
+            return custom_example
+        return super().example()
+
+    def schema_pattern(self) -> str:
+        custom_schema_pattern = self.custom_settings.get("schema_pattern")
+        if custom_schema_pattern:
+            return custom_schema_pattern
+        return super().schema_pattern()
+
+    def schema(self) -> str:
+        custom_schema = self.custom_settings.get("schema")
+        if custom_schema:
+            return custom_schema
+        return super().schema()
+
+    def info(self) -> str:
         info_path = self.custom_settings.get("info_path")
         info = self.custom_settings.get("info")
         if info_path:
@@ -86,4 +96,4 @@ def info(self) -> str | None:
             return content
         elif info:
             return info
-        return None
+        return super().info()

tests/test_cz_customize.py

@@ -1,6 +1,7 @@
 import pytest
 
 from commitizen.config import BaseConfig, JsonConfig, TomlConfig, YAMLConfig
+from commitizen.cz.conventional_commits import ConventionalCommitsCz
 from commitizen.cz.customize import CustomizeCommitsCz
 from commitizen.exceptions import MissingCzCustomizeConfigError
 
@@ -564,7 +565,8 @@ def test_info_with_info_path(tmpdir, config_info):
 
 def test_info_without_info(config_without_info):
     cz = CustomizeCommitsCz(config_without_info)
-    assert cz.info() is None
+    cz_super = ConventionalCommitsCz(config_without_info)
+    assert cz.info() == cz_super.info()
 
 
 def test_commit_parser(config):