From d2ec0473f8d4c25cc6f696e70ba110e1061e4dfe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 10 May 2023 20:27:17 -0400
Subject: [PATCH] Replace flake8 with ruff. Fixes jaraco/skeleton#79 and sheds
 debt.

---
 .flake8        | 9 ---------
 pyproject.toml | 6 +++---
 pytest.ini     | 8 --------
 setup.cfg      | 6 +-----
 4 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 .flake8

diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 48b2e24..0000000
--- a/.flake8
+++ /dev/null
@@ -1,9 +0,0 @@
-[flake8]
-max-line-length = 88
-
-# jaraco/skeleton#34
-max-complexity = 10
-
-extend-ignore =
-	# Black creates whitespace before colon
-	E203
diff --git a/pyproject.toml b/pyproject.toml
index 60de242..d5f3487 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,8 +13,8 @@ addopts = "--black"
 [tool.pytest-enabler.mypy]
 addopts = "--mypy"
 
-[tool.pytest-enabler.flake8]
-addopts = "--flake8"
-
 [tool.pytest-enabler.cov]
 addopts = "--cov"
+
+[tool.pytest-enabler.ruff]
+addopts = "--ruff"
diff --git a/pytest.ini b/pytest.ini
index 99a2519..94515aa 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -7,19 +7,11 @@ filterwarnings=
 	# Ensure ResourceWarnings are emitted
 	default::ResourceWarning
 
-	# Suppress deprecation warning in flake8
-	ignore:SelectableGroups dict interface is deprecated::flake8
-
 	# shopkeep/pytest-black#55
 	ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
 	ignore:The \(fspath. py.path.local\) argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning
 	ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning
 
-	# tholo/pytest-flake8#83
-	ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
-	ignore:The \(fspath. py.path.local\) argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning
-	ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning
-
 	# shopkeep/pytest-black#67
 	ignore:'encoding' argument not specified::pytest_black
 
diff --git a/setup.cfg b/setup.cfg
index c062c7b..6b31311 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,11 +30,6 @@ testing =
 	# upstream
 	pytest >= 6
 	pytest-checkdocs >= 2.4
-	pytest-flake8; \
-		# workaround for tholo/pytest-flake8#87
-		python_version < "3.12"
-	# workaround for tholo/pytest-flake8#87
-	flake8 < 5
 	pytest-black >= 0.3.7; \
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
@@ -43,6 +38,7 @@ testing =
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
 	pytest-enabler >= 1.3
+	pytest-ruff
 
 	# local