Merge remote-tracking branch 'origin/master' into docs/skill-md-cleanup

# Conflicts:
#	.agents/skills/commitizen/SKILL.md

Co-authored-by: bearomorphism <26526132+bearomorphism@users.noreply.github.com>

Author: Copilot

.agents/skills/commitizen/SKILL.md

@@ -5,7 +5,7 @@ license: MIT
 metadata:
   project: commitizen-tools/commitizen
   docs: https://commitizen-tools.github.io/commitizen/
-  install: "pip install commitizen"
+  install: "pipx install commitizen"
 ---
 
 # Commitizen
@@ -38,7 +38,7 @@ Commitizen is a CLI for enforcing Conventional Commits, automating version bumps
 
 ## Important domain details
 
-- Commitizen installs with `pip install commitizen` or `uv add commitizen`.
+- Commitizen supports both global installation (recommended for the `cz` CLI) and project-local installation; see the installation section in `docs/README.md` for the full matrix of supported tools.
 - The default version scheme is PEP 440; `semver` and `semver2` are also supported.
 - Common version providers include `commitizen`, `pep621`, `poetry`, `cargo`, `npm`, `composer`, `uv`, and `scm`.
 - `cz changelog` generates Markdown changelogs.

.github/CODEOWNERS

@@ -39,7 +39,7 @@ jobs:
       - id: bump-version
         run: |
           old_sha="$(git rev-parse HEAD)"
-          cz bump --yes --no-raise 21
+          cz --no-raise 21 bump --yes
 
           if [ "$(git rev-parse HEAD)" = "$old_sha" ]; then
             echo "No bump-eligible commits found, skipping release."

.github/workflows/bumpversion.yml

@@ -5,6 +5,15 @@ on:
   push:
     tags:
       - "v*"
+  # Manual trigger for republishing a specific tag if the original push-on-tag
+  # run failed and is now too old to be re-run via the GitHub UI (#1790).
+  # ``ref`` should be a tag name like ``v4.11.1``.
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: "Tag to republish (e.g., v4.11.1)"
+        required: true
+        type: string
 
 jobs:
   deploy:
@@ -14,10 +23,19 @@ jobs:
       id-token: write
       contents: read
     steps:
+      - name: Validate dispatch ref is a tag
+        if: github.event_name == 'workflow_dispatch'
+        env:
+          TAG: ${{ github.event.inputs.ref }}
+        run: |
+          if ! git ls-remote --tags "https://github.com/${GITHUB_REPOSITORY}" "refs/tags/${TAG}" | grep -q .; then
+            echo "::error::Dispatch ref '${TAG}' is not an existing tag"
+            exit 1
+          fi
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ github.ref_name }}
+          ref: ${{ github.event_name == 'workflow_dispatch' && format('refs/tags/{0}', github.event.inputs.ref) || github.ref }}
       - name: Set up Python
         uses: astral-sh/setup-uv@v7
       - name: Build

.github/workflows/pythonpublish.yml

@@ -56,7 +56,7 @@ repos:
           - tomli
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.15.1 # automatically updated by Commitizen
+    rev: v4.16.2 # automatically updated by Commitizen
     hooks:
       - id: commitizen
       - id: commitizen-branch

.pre-commit-config.yaml

@@ -1 +1 @@
-__version__ = "4.15.1"
+__version__ = "4.16.2"

commitizen/__version__.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 @@
 
 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 @@ def __init__(self, config: BaseConfig) -> None:
             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/cz/customize/customize.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/defaults.py

@@ -57,6 +57,24 @@ The `--no-raise` (or `-nr`) flag allows you to specify exit codes that should no
 
 Multiple exit codes can be specified as a comma-separated list.
 
+!!! warning "Flag placement"
+    `--no-raise` / `-nr` is a **top-level Commitizen flag**, so it must be passed
+    **before** the subcommand:
+
+    ```sh
+    cz --no-raise 21 bump --yes        # ✅ correct
+    cz -nr 21 bump --yes               # ✅ correct (short form)
+    ```
+
+    Placing it after the subcommand fails with exit code 18
+    (`InvalidCommandArgumentError`):
+
+    ```sh
+    cz bump --yes --no-raise 21        # ❌ wrong
+    # Invalid commitizen arguments were found: `--no-raise`.
+    # Please use -- separator for extra git args
+    ```
+
 ### Common Use Cases
 
 #### Ignoring No Increment Errors