From bafe84440265acf3357e5739e101c926e3c2630b Mon Sep 17 00:00:00 2001
From: Jennifer Taylor <dragonminded@dragonminded.com>
Date: Wed, 18 Sep 2024 03:01:51 +0000
Subject: [PATCH] Unpin flake8 now that it's fixed, fix a few lint errors.

---
 bemani/backend/jubeat/base.py | 2 +-
 bemani/format/afp/util.py     | 2 +-
 requirements.txt              | 3 ++-
 verifylint                    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bemani/backend/jubeat/base.py b/bemani/backend/jubeat/base.py
index 4d10d25..396e074 100644
--- a/bemani/backend/jubeat/base.py
+++ b/bemani/backend/jubeat/base.py
@@ -167,7 +167,7 @@ class JubeatBase(CoreHandler, CardManagerHandler, PASELIHandler, Base):
             return None
 
         cache_key = f"get_scores_by_extid-{extid}"
-        score: Optional[List[Score]]
+        scores: Optional[List[Score]]
 
         if partition == 1:
             # We fetch all scores on the first partition and then divy up
diff --git a/bemani/format/afp/util.py b/bemani/format/afp/util.py
index 9b2383b..2c38516 100644
--- a/bemani/format/afp/util.py
+++ b/bemani/format/afp/util.py
@@ -72,7 +72,7 @@ class TrackedCoverage:
     def print_coverage(self, req_start: Optional[int] = None, req_end: Optional[int] = None) -> None:
         for start, offset in self.get_uncovered_chunks(req_start, req_end):
             print(
-                f"Uncovered: {hex(start)} - {hex(offset)} ({offset-start} bytes)",
+                f"Uncovered: {hex(start)} - {hex(offset)} ({offset - start} bytes)",
                 file=sys.stderr,
             )
 
diff --git a/requirements.txt b/requirements.txt
index f93d2dc..270667c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+setuptools
 Cython
 SQLAlchemy<2.0.0
 alembic
@@ -16,7 +17,7 @@ types-Werkzeug
 types-Flask
 types-freezegun
 types-python-dateutil
-flake8==4.0.1
+flake8
 typed-ast
 freezegun
 pyreact @ git+https://github.com/DragonMinded/react-python@main
diff --git a/verifylint b/verifylint
index 9759432..5e85ee1 100755
--- a/verifylint
+++ b/verifylint
@@ -1,3 +1,3 @@
 #! /bin/bash
 
-flake8 bemani/ --ignore E203,E501,E252,E704,E741,W503,W504,B006,B008,B009 | grep -v "migrations\/"
+flake8 bemani/ --ignore E203,E501,E252,E704,E721,E741,W503,W504,B006,B008,B009 | grep -v "migrations\/"