commitizen 4.15.1__tar.gz → 4.16.1__tar.gz

{commitizen-4.15.1 → commitizen-4.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commitizen
-Version: 4.15.1
+Version: 4.16.1
 Summary: Python commitizen client tool
 Keywords: commitizen,conventional,commits,git
 Author: Santiago Fraire

commitizen-4.16.1/commitizen/__version__.py

@@ -0,0 +1 @@
+__version__ = "4.16.1"

{commitizen-4.15.1 → commitizen-4.16.1}/commitizen/cmd.py

@@ -103,3 +103,43 @@ def run_shell(cmd: str, env: Mapping[str, str] | None = None) -> Command:
     https://github.com/commitizen-tools/commitizen/issues/1918
     """
     return _popen(cmd, shell=True, env=env)
+
+
+def run_interactive(
+    cmd: str | Sequence[str], env: Mapping[str, str] | None = None
+) -> int:
+    """Run a command safely without shell interpretation and without redirecting stdin, stdout, or stderr
+
+    Args:
+        cmd: The command to run
+        env: Extra environment variables to define in the subprocess. Defaults to None.
+
+    Returns:
+        subprocess returncode
+    """
+    if env is not None:
+        env = {**os.environ, **env}
+    if isinstance(cmd, str):
+        warnings.warn(
+            "Passing a string to cmd.run_interactive() is deprecated and will be removed in v5. "
+            "Use a list of arguments instead, or use cmd.run_interactive_shell() explicitly.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return subprocess.run(cmd, shell=True, env=env).returncode
+    return subprocess.run(cmd, shell=False, env=env).returncode
+
+
+def run_interactive_shell(cmd: str, env: Mapping[str, str] | None = None) -> int:
+    """Run a command without redirecting stdin, stdout, or stderr
+
+    Args:
+        cmd: The command to run
+        env: Extra environment variables to define in the subprocess. Defaults to None.
+
+    Returns:
+        subprocess returncode
+    """
+    if env is not None:
+        env = {**os.environ, **env}
+    return subprocess.run(cmd, shell=True, env=env).returncode

{commitizen-4.15.1 → commitizen-4.16.1}/commitizen/cz/customize/customize.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections import OrderedDict
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
@@ -19,11 +20,29 @@ else:
 
 from commitizen import defaults
 from commitizen.cz.base import BaseCommitizen
+from commitizen.defaults import MAJOR, MINOR
 from commitizen.exceptions import MissingCzCustomizeConfigError
 
 __all__ = ["CustomizeCommitsCz"]
 
 
+def _derive_major_version_zero(
+    bump_map: Mapping[str, str],
+) -> OrderedDict[str, str]:
+    """Derive a ``bump_map_major_version_zero`` from a user-supplied
+    ``bump_map`` by demoting any ``MAJOR`` rule to ``MINOR``.
+
+    See #1728: when a ``cz_customize`` user supplies ``bump_map`` but not
+    ``bump_map_major_version_zero``, the latter previously fell through to
+    ``defaults.BUMP_MAP_MAJOR_VERSION_ZERO``, silently overriding the
+    user's intent during ``major_version_zero = true`` bumps.
+    """
+    return OrderedDict(
+        (pattern, MINOR if increment == MAJOR else increment)
+        for pattern, increment in bump_map.items()
+    )
+
+
 class CustomizeCommitsCz(BaseCommitizen):
     bump_pattern = defaults.BUMP_PATTERN
     bump_map = defaults.BUMP_MAP
@@ -49,6 +68,16 @@ class CustomizeCommitsCz(BaseCommitizen):
             if value := self.custom_settings.get(attr_name):
                 setattr(self, attr_name, value)
 
+        # When the user supplies a custom ``bump_map`` but no matching
+        # ``bump_map_major_version_zero``, derive the latter so that bumps
+        # under ``major_version_zero = true`` use the user's mapping rather
+        # than the (totally unrelated) ``defaults.BUMP_MAP_MAJOR_VERSION_ZERO``
+        # fallback. See #1728.
+        if self.custom_settings.get("bump_map") and not self.custom_settings.get(
+            "bump_map_major_version_zero"
+        ):
+            self.bump_map_major_version_zero = _derive_major_version_zero(self.bump_map)
+
     def questions(self) -> list[CzQuestion]:
         return self.custom_settings.get("questions", [{}])  # type: ignore[return-value]
 

{commitizen-4.15.1 → commitizen-4.16.1}/commitizen/hooks.py

@@ -17,14 +17,9 @@ def run(hooks: str | list[str], _env_prefix: str = "CZ_", **env: object) -> None
     for hook in hooks:
         out.info(f"Running hook '{hook}'")
 
-        c = cmd.run_shell(hook, env=_format_env(_env_prefix, env))
+        return_code = cmd.run_interactive(hook, env=_format_env(_env_prefix, env))
 
-        if c.out:
-            out.write(c.out)
-        if c.err:
-            out.error(c.err)
-
-        if c.return_code != 0:
+        if return_code != 0:
             raise RunHookError(f"Running hook '{hook}' failed")
 
 

{commitizen-4.15.1 → commitizen-4.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commitizen"
-version = "4.15.1"
+version = "4.16.1"
 description = "Python commitizen client tool"
 authors = [{ name = "Santiago Fraire", email = "santiwilly@gmail.com" }]
 maintainers = [
@@ -97,7 +97,7 @@ dev = [
     "tox-uv",
 ]
 
-base = ["poethepoet>=0.34.0"]
+base = ["mkdocs-llmstxt>=0.5.0", "poethepoet>=0.34.0"]
 
 test = [
     "pytest>=9",

commitizen-4.15.1/commitizen/__version__.py

@@ -1 +0,0 @@
-__version__ = "4.15.1"