From 388c7d1d70c2dabe1fe5e5eb1d453edd8f40a49d Mon Sep 17 00:00:00 2001
From: Eliah Kagan <degeneracypressure@gmail.com>
Date: Wed, 27 Sep 2023 00:05:08 -0400
Subject: [PATCH 1/2] Clearer YAML style for flake8 extra plugin list

---
 .pre-commit-config.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5a34b8af0..67aefb342 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,11 +4,9 @@ repos:
     hooks:
       - id: flake8
         additional_dependencies:
-          [
-            flake8-bugbear==23.9.16,
-            flake8-comprehensions==3.14.0,
-            flake8-typing-imports==1.14.0,
-          ]
+          - flake8-bugbear==23.9.16
+          - flake8-comprehensions==3.14.0
+          - flake8-typing-imports==1.14.0
         exclude: ^doc|^git/ext/
 
   - repo: https://github.com/pre-commit/pre-commit-hooks

From 1a8f210a42c3f9c46ce3cfa9c25ea39b0a8ca6c6 Mon Sep 17 00:00:00 2001
From: Eliah Kagan <degeneracypressure@gmail.com>
Date: Wed, 27 Sep 2023 02:40:11 -0400
Subject: [PATCH 2/2] Drop flake8 suppressions that are no longer needed

+ Remove the comments that documented those old suppressions
+ Format the .flake8 file more readably
---
 .flake8 | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/.flake8 b/.flake8
index ed5d036bf..1cc049a69 100644
--- a/.flake8
+++ b/.flake8
@@ -1,38 +1,26 @@
 [flake8]
+
 show-source = True
-count= True
+count = True
 statistics = True
-# E265 = comment blocks like @{ section, which it can't handle
+
 # E266 = too many leading '#' for block comment
 # E731 = do not assign a lambda expression, use a def
-# W293 = Blank line contains whitespace
-# W504 = Line break after operator
-# E704 = multiple statements in one line  - used for @override
 # TC002 = move third party import to TYPE_CHECKING
-# ANN = flake8-annotations
 # TC, TC2 = flake8-type-checking
-# D = flake8-docstrings
 
 # select = C,E,F,W ANN, TC, TC2  # to enable code. Disabled if not listed, including builtin codes
 enable-extensions = TC, TC2  # only needed for extensions not enabled by default
 
-ignore = E265,E266,E731,E704,
-         W293, W504,
-         ANN0 ANN1 ANN2,
-         TC002,
-         TC0, TC1, TC2
-         # B,
-         A,
-         D,
-         RST, RST3
+ignore = E266, E731
 
-exclude = .tox,.venv,build,dist,doc,git/ext/
+exclude = .tox, .venv, build, dist, doc, git/ext/
 
 rst-roles =  # for flake8-RST-docstrings
-    attr,class,func,meth,mod,obj,ref,term,var  # used by sphinx
+    attr, class, func, meth, mod, obj, ref, term, var  # used by sphinx
 
 min-python-version = 3.7.0
 
 # for `black` compatibility
 max-line-length = 120
-extend-ignore = E203,W503
+extend-ignore = E203, W503