Switch from black to ruff for code formatting.

It's faster and achieves pretty much the same result.

Author: aaugustin

.github/workflows/tests.yml

@@ -41,9 +41,7 @@ jobs:
         python-version: "3.x"
     - name: Install tox
       run: pip install tox
-    - name: Check code formatting
-      run: tox -e black
-    - name: Check code style
+    - name: Check code formatting & style
       run: tox -e ruff
     - name: Check types statically
       run: tox -e mypy

Makefile

@@ -8,7 +8,7 @@ build:
 	python setup.py build_ext --inplace
 
 style:
-	black src tests
+	ruff format src tests
 	ruff check --fix src tests
 
 types:

src/websockets/asyncio/client.py

@@ -297,7 +297,6 @@ def __init__(
         # Other keyword arguments are passed to loop.create_connection
         **kwargs: Any,
     ) -> None:
-
         wsuri = parse_uri(uri)
 
         if wsuri.secure:

src/websockets/asyncio/server.py

@@ -722,7 +722,6 @@ def __init__(
         # Other keyword arguments are passed to loop.create_server
         **kwargs: Any,
     ) -> None:
-
         if subprotocols is not None:
             validate_subprotocols(subprotocols)
 

src/websockets/legacy/server.py

@@ -100,9 +100,10 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
 
     def __init__(
         self,
+        # The version that accepts the path in the second argument is deprecated.
         ws_handler: (
             Callable[[WebSocketServerProtocol], Awaitable[Any]]
-            | Callable[[WebSocketServerProtocol, str], Awaitable[Any]]  # deprecated
+            | Callable[[WebSocketServerProtocol, str], Awaitable[Any]]
         ),
         ws_server: WebSocketServer,
         *,
@@ -983,9 +984,10 @@ class Serve:
 
     def __init__(
         self,
+        # The version that accepts the path in the second argument is deprecated.
         ws_handler: (
             Callable[[WebSocketServerProtocol], Awaitable[Any]]
-            | Callable[[WebSocketServerProtocol, str], Awaitable[Any]]  # deprecated
+            | Callable[[WebSocketServerProtocol, str], Awaitable[Any]]
         ),
         host: str | Sequence[str] | None = None,
         port: int | None = None,
@@ -1140,9 +1142,10 @@ async def __await_impl__(self) -> WebSocketServer:
 
 
 def unix_serve(
+    # The version that accepts the path in the second argument is deprecated.
     ws_handler: (
         Callable[[WebSocketServerProtocol], Awaitable[Any]]
-        | Callable[[WebSocketServerProtocol, str], Awaitable[Any]]  # deprecated
+        | Callable[[WebSocketServerProtocol, str], Awaitable[Any]]
     ),
     path: str | None = None,
     **kwargs: Any,
@@ -1169,7 +1172,7 @@ def remove_path_argument(
     ws_handler: (
         Callable[[WebSocketServerProtocol], Awaitable[Any]]
         | Callable[[WebSocketServerProtocol, str], Awaitable[Any]]
-    )
+    ),
 ) -> Callable[[WebSocketServerProtocol], Awaitable[Any]]:
     try:
         inspect.signature(ws_handler).bind(None)

tests/legacy/test_client_server.py

@@ -1293,7 +1293,6 @@ def test_connection_error_during_closing_handshake(self, close):
 class ClientServerTests(
     CommonClientServerTests, ClientServerTestsMixin, AsyncioTestCase
 ):
-
     def test_redirect_secure(self):
         with temp_test_redirecting_server(self):
             # websockets doesn't support serving non-TLS and TLS connections

tox.ini

@@ -7,12 +7,12 @@ env_list =
     py312
     py313
     coverage
-    black
     ruff
     mypy
 
 [testenv]
-commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning -m unittest {posargs}
+commands =
+    python -W error::DeprecationWarning -W error::PendingDeprecationWarning -m unittest {posargs}
 pass_env = WEBSOCKETS_*
 
 [testenv:coverage]
@@ -27,14 +27,13 @@ commands =
     python -m coverage report --show-missing --fail-under=100
 deps = coverage
 
-[testenv:black]
-commands = black --check src tests
-deps = black
-
 [testenv:ruff]
-commands = ruff check src tests
+commands =
+    ruff format --check src tests
+    ruff check src tests
 deps = ruff
 
 [testenv:mypy]
-commands = mypy --strict src
+commands =
+    mypy --strict src
 deps = mypy