Merge branch 'master' into feature/single-number-version

Author: YazdanRa

.github/pull_request_template.md

@@ -14,7 +14,7 @@ Please fill in the following content to let us know better about this change.
 ### Code Changes
 
 - [ ] Add test cases to all the changes you introduce
-- [ ] Run `poetry all` locally to ensure this change passes linter check and tests
+- [ ] Run `uv run poe all` locally to ensure this change passes linter check and tests
 - [ ] Manually test the changes:
   - [ ] Verify the feature/bug fix works as expected in real-world scenarios
   - [ ] Test edge cases and error conditions
@@ -24,10 +24,10 @@ Please fill in the following content to let us know better about this change.
 
 ### Documentation Changes
 
-- [ ] Run `poetry doc` locally to ensure the documentation pages renders correctly
+- [ ] Run `uv run poe doc` locally to ensure the documentation pages renders correctly
 - [ ] Check and fix any broken links (internal or external) in the documentation
 
-> When running `poetry doc`, any broken internal documentation links will be reported in the console output like this:
+> When running `uv run poe doc`, any broken internal documentation links will be reported in the console output like this:
 >
 > ```text
 > INFO    -  Doc file 'config.md' contains a link 'commands/bump.md#-post_bump_hooks', but the doc 'commands/bump.md' does not contain an anchor '#-post_bump_hooks'.

.github/workflows/docspublish.yml

@@ -15,17 +15,14 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.x"
+        uses: astral-sh/setup-uv@v7
       - name: Install dependencies
         run: |
-          python -m pip install -U pip poetry poethepoet
-          poetry --version
-          poetry install --only main,script
+          uv --version
+          uv sync --frozen --group base --group script
       - name: Update CLI screenshots
         run: |
-          poetry doc:screenshots
+          uv run --no-sync poe doc:screenshots
       - name: Commit and push updated CLI screenshots
         run: |
           git config --global user.name "github-actions[bot]"
@@ -51,14 +48,11 @@ jobs:
         run: |
           git pull origin master
       - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.x"
+        uses: astral-sh/setup-uv@v7
       - name: Install dependencies
         run: |
-          python -m pip install -U pip poetry poethepoet
-          poetry --version
-          poetry install --no-root --only documentation
+          uv --version
+          uv sync --frozen --only-group base --only-group documentation
       - name: Generate Sponsors 💖
         uses: JamesIves/github-sponsors-readme-action@v1
         with:
@@ -69,7 +63,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          poetry doc:build
+          uv run --no-sync poe doc:build
       - name: Deploy 🚀
         uses: JamesIves/github-pages-deploy-action@v4
         with:

.github/workflows/homebrewpublish.yml

@@ -14,12 +14,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
       - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.x"
+        uses: astral-sh/setup-uv@v7
       - name: Install dependencies
-        run: |
-          python -m pip install -U commitizen
+        run: uv pip install -U commitizen
       - name: Set Project version env variable
         run: |
           echo "project_version=$(cz version --project)" >> $GITHUB_ENV

.github/workflows/links.yml

@@ -11,7 +11,7 @@ jobs:
   check-links:
     runs-on: ubuntu-latest
     permissions:
-      issues: write # required for peter-evans/create-issue-from-file
+      issues: write # required for Broken Links Report
     steps:
       - uses: actions/checkout@v6
 

.github/workflows/pythonpackage.yml

@@ -8,38 +8,63 @@ on:
   workflow_dispatch:
 
 jobs:
+  detect_changes:
+    runs-on: ubuntu-latest
+    outputs:
+      relevant: ${{ steps.filter.outputs.relevant }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - id: filter
+        uses: dorny/paths-filter@v3
+        with:
+          filters: |
+            relevant:
+              - "commitizen/**"
+              - "tests/**"
+              - ".github/workflows/**"
   python-check:
+    needs: detect_changes
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         platform: [ubuntu-22.04, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
+      - name: No relevant changes, fast-path success
+        if: ${{ needs.detect_changes.outputs.relevant != 'true' }}
+        run: |
+          echo "No relevant file changes; skipping tests and linters."
       - uses: actions/checkout@v6
+        if: ${{ needs.detect_changes.outputs.relevant == 'true' }}
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: astral-sh/setup-uv@v7
+        if: ${{ needs.detect_changes.outputs.relevant == 'true' }}
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
+        if: ${{ needs.detect_changes.outputs.relevant == 'true' }}
         run: |
-          python -m pip install -U pip poetry poethepoet
-          poetry --version
-          poetry install --only main,linters,test
+          uv --version
+          uv sync --frozen --group base --group test --group linters
       - name: Run tests and linters
+        if: ${{ needs.detect_changes.outputs.relevant == 'true' }}
         run: |
           git config --global user.email "action@github.com"
           git config --global user.name "GitHub Action"
-          poetry ci
+          uv run --no-sync poe ci
         shell: bash
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
+        if: ${{ needs.detect_changes.outputs.relevant == 'true' }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload test results to Codecov
         uses: codecov/codecov-action@v5
-        if: ${{ !cancelled() }}
+        if: ${{ needs.detect_changes.outputs.relevant == 'true' && !cancelled() }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           report_type: test_results

.github/workflows/pythonpublish.yml

@@ -8,21 +8,17 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - uses: actions/checkout@v6
         with:
           token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.x"
-      - name: Install dependencies
-        run: |
-          python -m pip install -U pip poetry
-          poetry --version
-      - name: Publish
-        env:
-          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: poetry publish --build
+        uses: astral-sh/setup-uv@v7
+      - name: Build
+        run: uv build
+      - name: Publish package to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.pre-commit-config.yaml

@@ -29,6 +29,14 @@ repos:
         args: [ '--unsafe' ] # for mkdocs.yml
       - id: detect-private-key
 
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.9.18
+    hooks:
+      - id: uv-lock
+      - id: uv-sync
+        args: [ --frozen, --all-groups ]
+        stages: [ pre-commit, post-checkout, post-merge, post-rewrite ]
+
   - repo: https://github.com/asottile/blacken-docs
     rev: 1.19.1
     hooks:
@@ -48,7 +56,7 @@ repos:
           - tomli
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.11.0 # automatically updated by Commitizen
+    rev: v4.11.3 # automatically updated by Commitizen
     hooks:
       - id: commitizen
       - id: commitizen-branch
@@ -63,15 +71,15 @@ repos:
   - repo: local
     hooks:
       - id: format
-        name: Format Python code via Poetry
+        name: Format Python code
         language: system
         pass_filenames: false
-        entry: poetry format
+        entry: uv run --no-sync poe format
         types: [ python ]
 
       - id: linter and test
-        name: Linters via Poetry
+        name: Linters
         language: system
         pass_filenames: false
-        entry: poetry lint
+        entry: uv run --no-sync poe lint
         types: [ python ]

AGENTS.md

@@ -0,0 +1,54 @@
+# AGENTS instructions
+
+## Purpose
+
+This file provides **project-specific guidance for AI agents** (and other automated tools) working on the `commitizen` repository.
+Follow these instructions in addition to any higher-level system or tool rules.
+
+## Project Overview
+
+- **Project**: `commitizen` - a tool to help enforce and automate conventional commits, version bumps, and changelog generation.
+- **Primary language**: Python (library + CLI).
+- **Key entrypoints**:
+  - `commitizen/cli.py` - main CLI implementation.
+  - `commitizen/commands/` - subcommands such as `bump`, `commit`, `changelog`, `check`, etc.
+  - `commitizen/config/` - configuration discovery and loading.
+  - `commitizen/providers/` - version providers (e.g., `pep621`, `poetry`, `npm`, `uv`).
+
+## General Expectations
+
+- **Preserve public behavior and CLI UX.**
+- **Avoid breaking changes** (APIs, CLI flags, exit codes) unless explicitly requested.
+- **Keep changes small and focused.**
+- **Update or add tests/docs** when you change user-facing behavior.
+
+## How to Explore and Validate Changes
+
+- **Code entrypoints**:
+  - CLI behavior: `commitizen/cli.py` and `commitizen/commands/`.
+  - Config resolution: `commitizen/config/factory.py` and config modules.
+  - Bump/changelog/versioning: `commitizen/bump.py`, `commitizen/changelog.py`, `commitizen/version_schemes.py`, `commitizen/providers/`.
+- **Docs to consult** (before larger changes):
+  - `docs/README.md`
+  - `docs/contributing.md`
+  - `docs/commands/` and `docs/config/`
+- **Tests**:
+  - Prefer targeted runs, e.g. `uv run pytest tests/test_cli.py` or a specific `tests/commands/` file.
+
+## Coding Guidelines (for AI tools)
+
+- **Style**: Follow patterns in nearby code; keep functions focused.
+- **Types**: Preserve or improve existing type hints.
+- **Errors**: Prefer `commitizen/exceptions.py` error types; keep messages clear for CLI users.
+- **Output**: Use `commitizen/out.py`; do not add noisy logging.
+
+## Common Task Pointers
+
+- **CLI commands**: edit `commitizen/commands/<name>.py`, wire via `commitizen/cli.py`, and adjust `tests/commands/` + `docs/commands/`.
+- **Version bumps / changelog**: use `commitizen/bump.py`, `commitizen/changelog.py`, `commitizen/version_schemes.py`, and `commitizen/providers/` (+ matching tests).
+- **Config resolution**: use `commitizen/config/factory.py` and config modules; update `tests/test_conf.py` and related tests.
+
+## When Unsure
+
+- Prefer **reading tests and documentation first** to understand the expected behavior.
+- When behavior is ambiguous, **assume backward compatibility** with current tests and docs is required.

CHANGELOG.md

@@ -1,3 +1,21 @@
+## v4.11.3 (2026-01-13)
+
+### Fix
+
+- **bump**: fix the issue that changelog_merge_prerelease not working on cz bump
+
+## v4.11.2 (2026-01-12)
+
+### Fix
+
+- **config**: add warning for multiple configuration files and update documentation (#1773)
+
+## v4.11.1 (2026-01-03)
+
+### Fix
+
+- **providers**: normalize package names in uv provider for uv.lock matching
+
 ## v4.11.0 (2025-12-29)
 
 ### Feat

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "4.11.0"
+__version__ = "4.11.3"