commitizen 4.16.0__tar.gz → 4.16.2__tar.gz

{commitizen-4.16.0 → commitizen-4.16.2}/PKG-INFO

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

commitizen-4.16.2/commitizen/__version__.py

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

{commitizen-4.16.0 → commitizen-4.16.2}/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.16.0 → commitizen-4.16.2}/commitizen/defaults.py

@@ -156,8 +156,17 @@ def get_tag_regexes(
         "major": r"(?P<major>\d+)",
         "minor": r"(?P<minor>\d+)",
         "patch": r"(?P<patch>\d+)",
-        "prerelease": r"(?P<prerelease>\w+\d+)?",
-        "devrelease": r"(?P<devrelease>\.dev\d+)?",
+        # Allow ``\w+`` (PEP-440 ``rc0``) as well as ``\w+\.\w+(\.\w+)*``
+        # (SemVer2 ``rc.0``, ``alpha.beta.1``). The original ``\w+\d+`` only
+        # matched the PEP-440 form and produced "Invalid version tag" warnings
+        # for SemVer2-style tags created by commitizen itself (#1614).
+        "prerelease": r"(?P<prerelease>\w+(?:\.\w+)*)?",
+        # Match either ``.dev1`` (PEP-440 with leading dot) or ``dev1``
+        # (SemVer / SemVer2 / users substituting ``${devrelease}`` directly
+        # in a ``tag_format`` -- see #1615). A bare ``\d+`` after the prefix
+        # would let the regex match arbitrary numeric suffixes, so the
+        # ``dev`` literal is required.
+        "devrelease": r"(?P<devrelease>\.?dev\d+)?",
     }
     return {
         **{f"${k}": v for k, v in regexes.items()},

{commitizen-4.16.0 → commitizen-4.16.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commitizen"
-version = "4.16.0"
+version = "4.16.2"
 description = "Python commitizen client tool"
 authors = [{ name = "Santiago Fraire", email = "santiwilly@gmail.com" }]
 maintainers = [

commitizen-4.16.0/commitizen/__version__.py

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