Merge branch 'main' into consolidate

.pre-commit-config.yaml

@@ -1,4 +1,10 @@
 ---
+ci:
+  skip:
+    # pre-commit.ci has trouble with this one
+    - update-docs
+    - end-of-file-fixer
+    - trailing-whitespace
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.1.0

changelogs/fragments/enable_upgrade_black.yml

@@ -0,0 +1,4 @@
+---
+trivial:
+  - Enable black via pre-commit.ci
+  - Update black version to latest

changelogs/fragments/pre-commit-skip.yml

@@ -0,0 +1,6 @@
+---
+trivial:
+  - Exempt update-docs from pre-commit.ci
+  - Disable black temporarily until it can be upgraded
+  - Disable end-of-file-fixer
+  - Disable trailing-whitespace