From ce6b7aeb828e4cdd2f2056e18ae7872dd53d6787 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@pythonspeed.com>
Date: Fri, 24 Mar 2023 11:38:22 -0400
Subject: [PATCH] More modern pylint and flake8 and friends.

---
 setup.py | 2 +-
 tox.ini  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 152c49f0e..6528b01ed 100644
--- a/setup.py
+++ b/setup.py
@@ -400,7 +400,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
               # disagreeing on what is or is not a lint issue.  We can bump
               # this version from time to time, but we will do it
               # intentionally.
-              "pyflakes == 2.2.0",
+              "pyflakes == 3.0.1",
               "coverage ~= 5.0",
               "mock",
               "tox ~= 3.0",
diff --git a/tox.ini b/tox.ini
index 382ba973e..447745784 100644
--- a/tox.ini
+++ b/tox.ini
@@ -100,10 +100,9 @@ commands =
 [testenv:codechecks]
 basepython = python3
 deps =
-     # Newer versions of PyLint have buggy configuration
-     # (https://github.com/PyCQA/pylint/issues/4574), so stick to old version
-     # for now.
-     pylint < 2.5
+     # Make sure we get a version of PyLint that respects config, and isn't too
+     # old.
+     pylint < 2.18, >2.14
 # On macOS, git inside of towncrier needs $HOME.
 passenv = HOME
 setenv =