Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ci:
autoupdate_schedule: monthly
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.20
rev: v0.16.1
hooks:
- id: ruff-check
- id: ruff-format
Expand All @@ -12,7 +12,7 @@ repos:
- id: check-github-workflows
- id: check-readthedocs
- repo: https://github.com/zizmorcore/zizmor-pre-commit
rev: v1.26.1
rev: v1.29.0
hooks:
- id: zizmor
# TODO: Remove blacken-docs when https://github.com/astral-sh/ruff/issues/8237 is implemented
Expand All @@ -22,6 +22,6 @@ repos:
- id: blacken-docs
additional_dependencies: [black==25.1.0]
- repo: https://github.com/astral-sh/uv-pre-commit
rev: 0.11.26
rev: 0.12.1
hooks:
- id: uv-lock
4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ ignore = [
"ARG", # unused arguments are common w/ interfaces
"COM", # let formatter take care commas
"C901", # don't enforce complexity level
"CPY001", # don't require copyright notice at top of file
"D", # don't require docstrings
"DTZ007", # ignore false positives due to https://github.com/astral-sh/ruff/issues/1306
"E501", # leave line-length enforcement to formatter
Expand Down Expand Up @@ -128,6 +129,9 @@ ignore = [
"S", # allow asserts
"T", # allow prints
]
"performance/benchmark.py" = [
"PLR0917", # allow many positional arguments
]
"src/marshmallow/orderedset.py" = [
"FBT002", # allow boolean positional argument
"T", # allow prints
Expand Down
2 changes: 1 addition & 1 deletion src/marshmallow/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def deserialize(
attr: str | None = None,
data: typing.Mapping[str, typing.Any] | None = None,
**kwargs,
) -> None | _InternalT: ...
) -> _InternalT | None: ...

# If value is not None, internal type is returned
@typing.overload
Expand Down
Loading