From 568983060120cb3f235953f0eb3e68da1c79b60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Sp=C3=B6ttel?=
 <1682504+fspoettel@users.noreply.github.com>
Date: Wed, 28 Jun 2023 10:26:40 +0200
Subject: [PATCH] feat: migrate `flake8` -> `ruff`

---
 .flake8                  | 4 ----
 .github/workflows/ci.yml | 6 ++----
 Makefile                 | 5 +++--
 pyproject.toml           | 6 +-----
 4 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 .flake8

diff --git a/.flake8 b/.flake8
deleted file mode 100644
index c7c7565..0000000
--- a/.flake8
+++ /dev/null
@@ -1,4 +0,0 @@
-[flake8]
-max-line-length = 88
-extend-ignore = E203
-exclude = .git,__pycache__,__init__.py,.mypy_cache,.pytest_cache,app/alembic/versions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aba3c77..8f88e52 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,8 @@ jobs:
           cache: 'pip'
           cache-dependency-path: '**/pyproject.toml'
       - run: pip install -e .[web,tooling]
-      - run: black --check app
-      - run: isort --check app
-      - run: flake8 app
-      - run: mypy app
+      - run: make lint
+
   test:
     runs-on: ubuntu-latest
     name: Test
diff --git a/Makefile b/Makefile
index 2ff2fbe..4f2752e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,11 @@ dev:
 
 fmt:
 	black app
-	isort app
+	ruff check app --fix
 
 lint:
-	flake8 app
+	black --check app
+	ruff check app
 	mypy app
 
 test:
diff --git a/pyproject.toml b/pyproject.toml
index d09754a..7becd31 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,9 +26,8 @@ worker=[
 tooling = [
   # code formatting
   "black ==23.3.0",
-  "isort ==5.12.0",
   # linting
-  "flake8 ==6.0.0",
+  "ruff ==0.0.275",
   # tests
   "httpx",
   "sqlalchemy-utils ==0.41.1",
@@ -39,8 +38,5 @@ tooling = [
   "types-requests ==2.31.0.1"
 ]
 
-[tool.isort]
-profile = "black"
-
 [tool.setuptools]
 py-modules = []