Skip to content

Commit f10ec39

Browse files
authored
Merge branch 'master' into docs/custom-commitizen-package-install
2 parents 23f0665 + d00cf03 commit f10ec39

File tree

77 files changed

+1739
-776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1739
-776
lines changed

.github/workflows/docspublish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- name: Install dependencies
2020
run: |
2121
uv --version
22-
uv sync --locked --group script
22+
uv sync --frozen --group base --group script
2323
- name: Update CLI screenshots
2424
run: |
25-
uv run poe doc:screenshots
25+
uv run --no-sync poe doc:screenshots
2626
- name: Commit and push updated CLI screenshots
2727
run: |
2828
git config --global user.name "github-actions[bot]"
@@ -52,7 +52,7 @@ jobs:
5252
- name: Install dependencies
5353
run: |
5454
uv --version
55-
uv sync --locked --only-group documentation
55+
uv sync --frozen --only-group base --only-group documentation
5656
- name: Generate Sponsors 💖
5757
uses: JamesIves/github-sponsors-readme-action@v1
5858
with:
@@ -63,7 +63,7 @@ jobs:
6363
env:
6464
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6565
run: |
66-
uv run poe doc:build
66+
uv run --no-sync poe doc:build
6767
- name: Deploy 🚀
6868
uses: JamesIves/github-pages-deploy-action@v4
6969
with:

.github/workflows/pythonpackage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
- name: Install dependencies
2626
run: |
2727
uv --version
28-
uv sync --locked --dev --group test --group linters
28+
uv sync --frozen --group base --group test --group linters
2929
- name: Run tests and linters
3030
run: |
3131
git config --global user.email "action@github.com"
3232
git config --global user.name "GitHub Action"
33-
uv run poe ci
33+
uv run --no-sync poe ci
3434
shell: bash
3535
- name: Upload coverage to Codecov
3636
uses: codecov/codecov-action@v5

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ repos:
3434
hooks:
3535
- id: uv-lock
3636
- id: uv-sync
37-
args: [ --locked, --all-groups ]
37+
args: [ --frozen, --all-groups ]
3838
stages: [ pre-commit, post-checkout, post-merge, post-rewrite ]
3939

4040
- repo: https://github.com/asottile/blacken-docs
@@ -56,7 +56,7 @@ repos:
5656
- tomli
5757

5858
- repo: https://github.com/commitizen-tools/commitizen
59-
rev: v4.11.0 # automatically updated by Commitizen
59+
rev: v4.11.1 # automatically updated by Commitizen
6060
hooks:
6161
- id: commitizen
6262
- id: commitizen-branch
@@ -74,12 +74,12 @@ repos:
7474
name: Format Python code
7575
language: system
7676
pass_filenames: false
77-
entry: uv run poe format
77+
entry: uv run --no-sync poe format
7878
types: [ python ]
7979

8080
- id: linter and test
8181
name: Linters
8282
language: system
8383
pass_filenames: false
84-
entry: uv run poe lint
84+
entry: uv run --no-sync poe lint
8585
types: [ python ]

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v4.11.1 (2026-01-03)
2+
3+
### Fix
4+
5+
- **providers**: normalize package names in uv provider for uv.lock matching
6+
17
## v4.11.0 (2025-12-29)
28

39
### Feat

commitizen/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "4.11.0"
1+
__version__ = "4.11.1"

commitizen/providers/uv_provider.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import tomlkit
66
import tomlkit.items
7+
from packaging.utils import canonicalize_name
78

89
from commitizen.providers.base_provider import TomlProvider
910

@@ -27,12 +28,13 @@ def set_version(self, version: str) -> None:
2728
def set_lock_version(self, version: str) -> None:
2829
pyproject_toml_content = tomlkit.parse(self.file.read_text())
2930
project_name = pyproject_toml_content["project"]["name"] # type: ignore[index]
31+
normalized_project_name = canonicalize_name(str(project_name))
3032

3133
document = tomlkit.parse(self.lock_file.read_text())
3234

3335
packages: tomlkit.items.AoT = document["package"] # type: ignore[assignment]
3436
for i, package in enumerate(packages):
35-
if package["name"] == project_name:
37+
if package["name"] == normalized_project_name:
3638
document["package"][i]["version"] = version # type: ignore[index]
3739
break
3840
self.lock_file.write_text(tomlkit.dumps(document))

docs/commands/bump.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,14 @@ Supported variables:
504504
| `$prerelease`, `${prerelease}` | Prerelease (alpha, beta, release candidate) |
505505
| `$devrelease`, `${devrelease}` | Development release |
506506

507+
### `--yes`
508+
509+
Automatically answers “yes” to all interactive prompts during the bump process, allowing the command to run without manual confirmation.
510+
511+
```bash
512+
cz bump --yes
513+
```
514+
507515
[pep440]: https://www.python.org/dev/peps/pep-0440/
508516
[semver]: https://semver.org/
509517
[version_files]: ../config/bump.md#version_files

docs/contributing.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ If you're a first-time contributor, please check out issues labeled [good first
4040
```
4141
4. Set up the development environment:
4242
```bash
43-
uv sync --dev
43+
uv sync --dev --frozen
4444
```
4545
5. Set up pre-commit hooks:
4646
```bash
@@ -64,6 +64,7 @@ If you're a first-time contributor, please check out issues labeled [good first
6464
- Run the full test suite: `uv run poe all`
6565
- Ensure test coverage doesn't drop (we use [CodeCov](https://app.codecov.io/gh/commitizen-tools/commitizen))
6666
- For documentation changes, run `uv run poe doc` to check for warnings/errors
67+
- If you need to change some file regression snapshots, run: `uv run poe test:regen`
6768
4. **Committing Changes**
6869
- Use Commitizen to make commits (we follow [conventional commits](https://www.conventionalcommits.org/))
6970
- Example: `cz commit`

docs/contributing_tldr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Please check the [pyproject.toml](https://github.com/commitizen-tools/commitizen
1313

1414
```bash
1515
# Ensure you have the correct dependencies
16-
uv sync --dev
16+
uv sync --dev --frozen
1717

1818
# Make ruff happy
1919
uv run poe format

docs/customization/config_file.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ The basic steps are:
44

55
1. Define your custom committing or bumping rules in the configuration file.
66
2. Declare `name = "cz_customize"` in your configuration file, or add `-n cz_customize` when running Commitizen.
7+
!!! warning
8+
`cz_customize` is likely to be removed or renamed in the next major release.
79

810
Example:
911

0 commit comments

Comments
 (0)