Replace flake8 and isort by ruff.

Configure in pyproject.toml instead of setup.cfg.

Fix #1306.

Author: aaugustin

.github/workflows/tests.yml

@@ -44,9 +44,7 @@ jobs:
     - name: Check code formatting
       run: tox -e black
     - name: Check code style
-      run: tox -e flake8
-    - name: Check imports ordering
-      run: tox -e isort
+      run: tox -e ruff
     - name: Check types statically
       run: tox -e mypy
 

Makefile

@@ -1,18 +1,19 @@
-.PHONY: default style test coverage maxi_cov build clean
+.PHONY: default style types tests coverage maxi_cov build clean
 
 export PYTHONASYNCIODEBUG=1
 export PYTHONPATH=src
 export PYTHONWARNINGS=default
 
-default: coverage style
+default: style types tests
 
 style:
-	isort --project websockets src tests
 	black src tests
-	flake8 src tests
+	ruff --fix src tests
+
+types:
 	mypy --strict src
 
-test:
+tests:
 	python -m unittest
 
 coverage:

pyproject.toml

@@ -58,3 +58,19 @@ exclude_lines = [
     "self.fail\\(\".*\"\\)",
     "@unittest.skip",
 ]
+
+[tool.ruff]
+select = [
+    "E",  # pycodestyle
+    "F",  # Pyflakes
+    "W",  # pycodestyle
+    "I",  # isort
+]
+ignore = [
+    "F403",
+    "F405",
+]
+
+[tool.ruff.isort]
+combine-as-imports = true
+lines-after-imports = 2

setup.cfg

@@ -552,10 +552,10 @@ def select_subprotocol(
         subprotocols = set(client_subprotocols) & set(server_subprotocols)
         if not subprotocols:
             return None
-        priority = lambda p: (
-            client_subprotocols.index(p) + server_subprotocols.index(p)
-        )
-        return sorted(subprotocols, key=priority)[0]
+        return sorted(
+            subprotocols,
+            key=lambda p: client_subprotocols.index(p) + server_subprotocols.index(p),
+        )[0]
 
     async def handshake(
         self,

src/websockets/legacy/server.py

@@ -7,8 +7,7 @@ envlist =
     py311
     coverage
     black
-    flake8
-    isort
+    ruff
     mypy
 
 [testenv]
@@ -31,13 +30,9 @@ deps = coverage
 commands = black --check src tests
 deps = black
 
-[testenv:flake8]
-commands = flake8 src tests
-deps = flake8
-
-[testenv:isort]
-commands = isort --check-only src tests
-deps = isort
+[testenv:ruff]
+commands = ruff src tests
+deps = ruff
 
 [testenv:mypy]
 commands = mypy --strict src