From 94b1d70a6b38add8d12248fc612b8f872f24904a Mon Sep 17 00:00:00 2001
From: Marcelo Trylesinski <marcelotryle@gmail.com>
Date: Wed, 5 Apr 2023 14:30:01 +0200
Subject: [PATCH] Use ruff instead of flake8, autoflake and isort (#2110)

---
 pyproject.toml   | 6 ++++++
 requirements.txt | 4 +---
 scripts/check    | 3 +--
 scripts/lint     | 3 +--
 setup.cfg        | 8 --------
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 02cbb30d7..84935890c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,3 +55,9 @@ path = "starlette/__init__.py"
 include = [
     "/starlette",
 ]
+
+[tool.ruff]
+select = ["E", "F", "I"]
+
+[tool.ruff.isort]
+combine-as-imports = true
diff --git a/requirements.txt b/requirements.txt
index 0a50d9310..f43ed47a5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,13 +2,11 @@
 -e .[full]
 
 # Testing
-autoflake==1.5.3
 black==22.12.0
 coverage==7.1.0
-flake8==3.9.2
 importlib-metadata==4.13.0
-isort==5.10.1
 mypy==1.0.1
+ruff==0.0.260
 typing_extensions==4.5.0
 types-contextvars==2.4.7.2
 types-PyYAML==6.0.12.9
diff --git a/scripts/check b/scripts/check
index 5a38477cf..341ab624d 100755
--- a/scripts/check
+++ b/scripts/check
@@ -9,7 +9,6 @@ export SOURCE_FILES="starlette tests"
 set -x
 
 ./scripts/sync-version
-${PREFIX}isort --check --diff --project=starlette $SOURCE_FILES
 ${PREFIX}black --check --diff $SOURCE_FILES
-${PREFIX}flake8 $SOURCE_FILES
 ${PREFIX}mypy $SOURCE_FILES
+${PREFIX}ruff --diff $SOURCE_FILES
diff --git a/scripts/lint b/scripts/lint
index 92e121691..0e99a59a6 100755
--- a/scripts/lint
+++ b/scripts/lint
@@ -8,6 +8,5 @@ export SOURCE_FILES="starlette tests"
 
 set -x
 
-${PREFIX}autoflake --in-place --recursive $SOURCE_FILES
-${PREFIX}isort --project=starlette $SOURCE_FILES
+${PREFIX}ruff --fix $SOURCE_FILES
 ${PREFIX}black $SOURCE_FILES
diff --git a/setup.cfg b/setup.cfg
index 82cb8ad9e..c1881e780 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,3 @@
-[flake8]
-ignore = W503, E203, B305
-max-line-length = 88
-
 [mypy]
 disallow_untyped_defs = True
 ignore_missing_imports = True
@@ -16,10 +12,6 @@ no_implicit_optional = False
 disallow_untyped_defs = False
 check_untyped_defs = True
 
-[tool:isort]
-profile = black
-combine_as_imports = True
-
 [tool:pytest]
 addopts =
   -rxXs