Skip to content

Commit 13bc4af

Browse files
github-actions[bot]mergify[bot]
authored andcommitted
Bump version of pre-commit hooks (#555)
(cherry picked from commit 7e8f0a1) # Conflicts: # .pre-commit-config.yaml
1 parent 46042b1 commit 13bc4af

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

.pre-commit-config.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ repos:
4949
args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]
5050

5151
- repo: https://github.com/psf/black
52+
<<<<<<< HEAD
5253
rev: 25.9.0
54+
=======
55+
rev: 25.12.0
56+
>>>>>>> 7e8f0a1 (Bump version of pre-commit hooks (#555))
5357
hooks:
5458
- id: black
5559
args: ["--line-length=99"]
@@ -62,7 +66,11 @@ repos:
6266

6367
# CPP hooks
6468
- repo: https://github.com/pre-commit/mirrors-clang-format
69+
<<<<<<< HEAD
6570
rev: v21.1.2
71+
=======
72+
rev: v21.1.8
73+
>>>>>>> 7e8f0a1 (Bump version of pre-commit hooks (#555))
6674
hooks:
6775
- id: clang-format
6876
args: ['-fallback-style=none', '-i']
@@ -136,7 +144,11 @@ repos:
136144
exclude: CHANGELOG\.rst|\.(svg|pyc)$
137145

138146
- repo: https://github.com/python-jsonschema/check-jsonschema
147+
<<<<<<< HEAD
139148
rev: 0.34.1
149+
=======
150+
rev: 0.36.0
151+
>>>>>>> 7e8f0a1 (Bump version of pre-commit hooks (#555))
140152
hooks:
141153
- id: check-github-workflows
142154
args: ["--verbose"]

0 commit comments

Comments
 (0)