Merge branch 'main' into main

Author: Petter Moe Kvalvaag

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
       types: [text]
       stages: [commit, push, manual]
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.0.1
+    rev: v3.1.0
     hooks:
     - id: reorder-python-imports
       args: [--application-directories, '.:src', --py36-plus]