Update ruff config (#33)

Author: vrslev

Justfile

@@ -18,10 +18,10 @@ run-artemis:
     docker compose up
 
 run-consumer:
-    uv -q run python testing/consumer.py
+    ARTEMIS_HOST=0.0.0.0 uv -q run python testing/consumer.py
 
 run-producer:
-    uv -q run python testing/producer.py
+    ARTEMIS_HOST=0.0.0.0 uv -q run python testing/producer.py
 
 test-integration *args:
     #!/bin/bash

pyproject.toml

@@ -37,6 +37,7 @@ build-backend = "hatchling.build"
 [tool.hatch.version]
 source = "vcs"
 
+
 [tool.mypy]
 python_version = "3.11"
 warn_unused_ignores = true
@@ -51,32 +52,8 @@ line-length = 120
 [tool.ruff.lint]
 preview = true
 select = ["ALL"]
-ignore = [
-    "EM",
-    "FBT",
-    "TRY003",
-    "D1",
-    "D203",
-    "D213",
-    "G004",
-    "FA",
-    "ANN101",
-    "ANN102",
-    "COM812",
-    "ISC001",
-    "S101",
-    "SLF001",
-    "CPY001",
-    "S104",
-]
-extend-per-file-ignores = { "tests/*" = [
-    "ARG002",
-    "ARG003",
-    "PLR6301",
-    "ANN401",
-    "PLC2801",
-] }
-
+ignore = ["D1", "D203", "D213", "COM812", "ISC001", "CPY001"]
+extend-per-file-ignores = { "tests/*" = ["S101", "SLF001", "ARG"] }
 
 [tool.pytest.ini_options]
 addopts = "--cov -s"

stompman/client.py

@@ -90,13 +90,18 @@ def from_pydantic_multihost_hosts(cls, hosts: list[MultiHostHostLike]) -> list[S
         servers: list[Self] = []
         for host in hosts:
             if host["host"] is None:
-                raise ValueError("host must be set")
+                msg = "host must be set"
+                raise ValueError(msg)
             if host["port"] is None:
-                raise ValueError("port must be set")
+                msg = "port must be set"
+                raise ValueError(msg)
             if host["username"] is None:
-                raise ValueError("username must be set")
+                msg = "username must be set"
+                raise ValueError(msg)
             if host["password"] is None:
-                raise ValueError("password must be set")
+                msg = "password must be set"
+                raise ValueError(msg)
+
             servers.append(cls(host=host["host"], port=host["port"], login=host["username"], passcode=host["password"]))
         return servers
 
@@ -277,7 +282,8 @@ async def listen(self) -> AsyncIterator["AnyListeningEvent"]:
                 case HeartbeatFrame():
                     yield HeartbeatEvent(_client=self, _frame=frame)
                 case ConnectedFrame() | ReceiptFrame():
-                    raise AssertionError("Should be unreachable! Report the issue.", frame)
+                    msg = "Should be unreachable! Report the issue."
+                    raise AssertionError(msg, frame)
 
 
 @dataclass
@@ -290,9 +296,9 @@ def __post_init__(self) -> None:
         self.body = self._frame.body
 
     async def ack(self) -> None:
-        if self._client._connection.active:
+        if self._client._connection.active:  # noqa: SLF001
             with suppress(ConnectionLostError):
-                await self._client._connection.write_frame(
+                await self._client._connection.write_frame(  # noqa: SLF001
                     AckFrame(
                         headers={
                             "id": self._frame.headers["message-id"],
@@ -302,9 +308,9 @@ async def ack(self) -> None:
                 )
 
     async def nack(self) -> None:
-        if self._client._connection.active:
+        if self._client._connection.active:  # noqa: SLF001
             with suppress(ConnectionLostError):
-                await self._client._connection.write_frame(
+                await self._client._connection.write_frame(  # noqa: SLF001
                     NackFrame(
                         headers={
                             "id": self._frame.headers["message-id"],

testing/consumer.py

@@ -1,11 +1,12 @@
 import asyncio
 
 import stompman
+from tests.integration import CONNECTION_PARAMETERS
 
 
 async def main() -> None:
     async with (
-        stompman.Client(servers=[stompman.ConnectionParameters("0.0.0.0", 61616, "admin", "=123")]) as client,
+        stompman.Client(servers=[CONNECTION_PARAMETERS]) as client,
         client.subscribe("DLQ"),
     ):
         async for event in client.listen():

testing/producer.py

@@ -1,11 +1,12 @@
 import asyncio
 
 import stompman
+from tests.integration import CONNECTION_PARAMETERS
 
 
 async def main() -> None:
     async with (
-        stompman.Client(servers=[stompman.ConnectionParameters("0.0.0.0", 61616, "admin", "admin")]) as client,
+        stompman.Client(servers=[CONNECTION_PARAMETERS]) as client,
         client.enter_transaction() as transaction,
     ):
         for _ in range(10):

tests/integration.py

@@ -3,6 +3,7 @@
 from collections.abc import AsyncGenerator, Callable
 from contextlib import asynccontextmanager
 from itertools import starmap
+from typing import Final
 from uuid import uuid4
 
 import pytest
@@ -23,13 +24,16 @@
 
 pytestmark = pytest.mark.anyio
 
+CONNECTION_PARAMETERS: Final = stompman.ConnectionParameters(
+    host=os.environ["ARTEMIS_HOST"], port=61616, login="admin", passcode="%3D123"
+)
+
 
 @asynccontextmanager
 async def create_client() -> AsyncGenerator[stompman.Client, None]:
-    server = stompman.ConnectionParameters(
-        host=os.environ["ARTEMIS_HOST"], port=61616, login="admin", passcode="%3D123"
-    )
-    async with stompman.Client(servers=[server], read_timeout=10, connection_confirmation_timeout=10) as client:
+    async with stompman.Client(
+        servers=[CONNECTION_PARAMETERS], read_timeout=10, connection_confirmation_timeout=10
+    ) as client:
         yield client
 
 

tests/test_client.py

@@ -44,21 +44,15 @@
 @dataclass
 class BaseMockConnection(AbstractConnection):
     @classmethod
-    async def connect(
-        cls,
-        host: str,
-        port: int,
-        timeout: int,
-    ) -> Self | None:
+    async def connect(cls, host: str, port: int, timeout: int) -> Self | None:
         return cls()
 
     async def close(self) -> None: ...
     def write_heartbeat(self) -> None: ...
     async def write_frame(self, frame: AnyClientFrame) -> None: ...
+    @staticmethod
     async def read_frames(
-        self,
-        max_chunk_size: int,
-        timeout: int,
+        max_chunk_size: int, timeout: int
     ) -> AsyncGenerator[AnyServerFrame, None]:  # pragma: no cover
         await asyncio.Future()
         yield  # type: ignore[misc]
@@ -69,14 +63,12 @@ def create_spying_connection(
 ) -> tuple[type[AbstractConnection], list[AnyClientFrame | AnyServerFrame | HeartbeatFrame]]:
     @dataclass
     class BaseCollectingConnection(BaseMockConnection):
-        async def write_frame(self, frame: AnyClientFrame) -> None:
+        @staticmethod
+        async def write_frame(frame: AnyClientFrame) -> None:
             collected_frames.append(frame)
 
-        async def read_frames(
-            self,
-            max_chunk_size: int,
-            timeout: int,
-        ) -> AsyncGenerator[AnyServerFrame, None]:
+        @staticmethod
+        async def read_frames(max_chunk_size: int, timeout: int) -> AsyncGenerator[AnyServerFrame, None]:
             for frame in next(read_frames_iterator):
                 collected_frames.append(frame)
                 yield frame
@@ -149,12 +141,7 @@ async def connect(cls, host: str, port: int, timeout: int) -> Self | None:
 async def test_client_connect_to_one_server_fails() -> None:
     class MockConnection(BaseMockConnection):
         @classmethod
-        async def connect(
-            cls,
-            host: str,
-            port: int,
-            timeout: int,
-        ) -> Self | None:
+        async def connect(cls, host: str, port: int, timeout: int) -> Self | None:
             return None
 
     client = EnrichedClient(connection_class=MockConnection)
@@ -187,12 +174,7 @@ async def connect(cls, host: str, port: int, timeout: int) -> Self | None:
 async def test_client_connect_to_any_server_fails() -> None:
     class MockConnection(BaseMockConnection):
         @classmethod
-        async def connect(
-            cls,
-            host: str,
-            port: int,
-            timeout: int,
-        ) -> Self | None:
+        async def connect(cls, host: str, port: int, timeout: int) -> Self | None:
             return None
 
     client = EnrichedClient(
@@ -245,7 +227,7 @@ class MockConnection(connection_class):  # type: ignore[valid-type, misc]
 
 
 async def test_client_lifespan_connection_not_confirmed(monkeypatch: pytest.MonkeyPatch) -> None:
-    async def timeout(future: Awaitable[Any], timeout: float) -> Any:
+    async def timeout(future: Awaitable[Any], timeout: float) -> object:
         assert timeout == client.connection_confirmation_timeout
         return await original_wait_for(future, 0)
 
@@ -254,7 +236,7 @@ async def timeout(future: Awaitable[Any], timeout: float) -> Any:
 
     client = EnrichedClient(connection_class=BaseMockConnection)
     with pytest.raises(ConnectionConfirmationTimeoutError) as exc_info:
-        await client.__aenter__()
+        await client.__aenter__()  # noqa: PLC2801
 
     assert exc_info.value == ConnectionConfirmationTimeoutError(client.connection_confirmation_timeout)
 
@@ -267,7 +249,7 @@ async def test_client_lifespan_unsupported_protocol_version() -> None:
 
     client = EnrichedClient(connection_class=connection_class)
     with pytest.raises(UnsupportedProtocolVersionError) as exc_info:
-        await client.__aenter__()
+        await client.__aenter__()  # noqa: PLC2801
 
     assert exc_info.value == UnsupportedProtocolVersionError(
         given_version=given_version, supported_version=client.PROTOCOL_VERSION
@@ -399,7 +381,8 @@ async def test_ack_nack_connection_lost_error() -> None:
     connection_class, _ = create_spying_connection(get_read_frames_with_lifespan([[message_frame]]))
 
     class MockConnection(connection_class):  # type: ignore[valid-type, misc]
-        async def write_frame(self, frame: AnyClientFrame) -> None:
+        @staticmethod
+        async def write_frame(frame: AnyClientFrame) -> None:
             if isinstance(frame, AckFrame | NackFrame):
                 raise ConnectionLostError
 

tests/test_connection.py

@@ -25,19 +25,15 @@ async def make_connection() -> Connection | None:
     return await Connection.connect(host="localhost", port=12345, timeout=2)
 
 
-async def make_mocked_connection(
-    monkeypatch: pytest.MonkeyPatch,
-    reader: Any,
-    writer: Any,
-) -> Connection:
+async def make_mocked_connection(monkeypatch: pytest.MonkeyPatch, reader: object, writer: object) -> Connection:
     monkeypatch.setattr("asyncio.open_connection", mock.AsyncMock(return_value=(reader, writer)))
     connection = await make_connection()
     assert connection
     return connection
 
 
 def mock_wait_for(monkeypatch: pytest.MonkeyPatch) -> None:
-    async def mock_impl(future: Awaitable[Any], timeout: int) -> Any:  # noqa: ARG001
+    async def mock_impl(future: Awaitable[Any], timeout: int) -> object:
         return await original_wait_for(future, timeout=0)
 
     original_wait_for = asyncio.wait_for