Skip to content

Commit 02abbbf

Browse files
authored
Merge branch 'master' into fix-free-threaded-race-condition
2 parents 8d2913e + b9d13e6 commit 02abbbf

6 files changed

Lines changed: 558 additions & 48 deletions

File tree

.pre-commit-config.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
ci:
44
autoupdate_schedule: quarterly
5-
skip:
6-
- clang-format
75

86
repos:
97
- repo: https://github.com/python-jsonschema/check-jsonschema.git
@@ -113,10 +111,11 @@ repos:
113111
types:
114112
- file
115113
- rst
116-
- repo: https://github.com/cpp-linter/cpp-linter-hooks
117-
rev: v0.8.0
114+
- repo: https://github.com/pre-commit/mirrors-clang-format
115+
rev: v16.0.6
118116
hooks:
119117
- id: clang-format
118+
types_or: [c, c++]
120119
- repo: https://github.com/pre-commit/mirrors-mypy.git
121120
rev: v1.15.0
122121
hooks:

CHANGES/1318.contrib.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Switched to ``mirrors-clang-format`` and enabled clang-format in ``pre-commit.ci``
2+
-- by :user:`bdraco`.

multidict/_multidict_py.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ class _HtKeys(Generic[_V]): # type: ignore[misc]
481481
log2_size: int
482482
usable: int
483483

484-
indices: array # type: ignore[type-arg] # in py3.9 array is not generic
484+
indices: array # type: ignore[type-arg] # TODO(PY312): array[int]
485485
entries: list[Optional[_Entry[_V]]]
486486

487487
@functools.cached_property

0 commit comments

Comments
 (0)