Merge remote-tracking branch 'origin/main' into fix-clean

Author: tobiasraabe

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
     -   id: reorder-python-imports
         args: [--py37-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v2.32.1
     hooks:
     -   id: pyupgrade
         args: [--py37-plus]