Update black, ruff, and mypy; fix new linter warnings

pyproject.toml

@@ -27,12 +27,12 @@ hypercorn = "^0.14.3"
 httpx = "^0.24.0"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.3.0"
-mypy = "^1.2.0"
+black = "^24.2.0"
+mypy = "^1.8.0"
 pytest = "^7.3.1"
 pytest-trio = "^0.8.0"
 pytest-cov = "^4.0.0"
-ruff = "^0.0.261"
+ruff = "^0.2.1"
 Sphinx = "^6.1.3"
 sphinxcontrib-httpdomain = "^1.8.1"
 trio-typing = "^0.8.0"
@@ -42,10 +42,10 @@ types-pyyaml = "^6.0.1"
 optional = true
 
 [tool.poetry.group.lsp.dependencies]
-python-lsp-server = "^1.7.2"
-python-lsp-ruff = "^1.4.0"
-python-lsp-black = "^1.2.1"
-pylsp-mypy = "^0.6.6"
+python-lsp-server = "^1.10.0"
+python-lsp-ruff = "^2.1.0"
+python-lsp-black = "^2.0.0"
+pylsp-mypy = "^0.6.8"
 
 [tool.poetry.scripts]
 vumi2 = "vumi2.cli:main"
@@ -74,7 +74,11 @@ filterwarnings = [
 [tool.coverage.report]
 exclude_also = ["@overload"]
 
+
 [tool.ruff]
+target-version = "py311"
+
+[tool.ruff.lint]
 select = [
     "E", "F", "W", # pycodestyle + pyflakes == flake8 - mccabe
     "I",           # isort
@@ -87,12 +91,14 @@ select = [
     "SIM",         # flake8-simplify
     "PTH",         # flake8-use-pathlib
 ]
-target-version = "py311"
+ignore = [
+    "SIM117", # Nested `with` is often more readable.
+]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["vumi2"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/**" = [
-    "S101",  # It's okay to use `assert` in tests.
+    "S101", # It's okay to use `assert` in tests.
 ]

src/vumi2/applications/junebug_message_api/junebug_state_cache.py

@@ -20,28 +20,22 @@ async def store_event_http_info(
         message_id: str,
         url: str,
         auth_token: str | None,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @abstractmethod
-    async def fetch_event_http_info(self, message_id: str) -> EventHttpInfo | None:
-        ...
+    async def fetch_event_http_info(self, message_id: str) -> EventHttpInfo | None: ...
 
     @abstractmethod
-    async def delete_event_http_info(self, message_id: str) -> None:
-        ...
+    async def delete_event_http_info(self, message_id: str) -> None: ...
 
     @abstractmethod
-    async def store_inbound(self, msg: Message) -> None:
-        ...
+    async def store_inbound(self, msg: Message) -> None: ...
 
     @abstractmethod
-    async def fetch_inbound(self, message_id: str) -> Message | None:
-        ...
+    async def fetch_inbound(self, message_id: str) -> Message | None: ...
 
     @abstractmethod
-    async def delete_inbound(self, message_id: str) -> None:
-        ...
+    async def delete_inbound(self, message_id: str) -> None: ...
 
 
 @define

src/vumi2/connectors.py

@@ -35,8 +35,7 @@ def __init__(
         callback: MessageCallbackType,
         message_class: type[Message],
         concurrency: int,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     def __init__(
@@ -47,8 +46,7 @@ def __init__(
         callback: EventCallbackType,
         message_class: type[Event],
         concurrency: int,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     def __init__(
         self, nursery, connection, queue_name, callback, message_class, concurrency
@@ -175,14 +173,12 @@ async def _setup_consumer(
         message_type: str,
         handler: MessageCallbackType,
         message_class: type[Message],
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def _setup_consumer(
         self, message_type: str, handler: EventCallbackType, message_class: type[Event]
-    ) -> None:
-        ...
+    ) -> None: ...
 
     async def _setup_consumer(self, message_type, handler, message_class) -> None:
         routing_key = self.routing_key(message_type)

src/vumi2/message_caches.py

@@ -55,16 +55,13 @@ def __len__(self) -> int:
 
 class MessageCache(ABC):  # pragma: no cover
     @abstractmethod
-    def __init__(self, config: dict) -> None:
-        ...
+    def __init__(self, config: dict) -> None: ...
 
     @abstractmethod
-    async def store_outbound(self, outbound: Message) -> None:
-        ...
+    async def store_outbound(self, outbound: Message) -> None: ...
 
     @abstractmethod
-    async def fetch_outbound(self, message_id: str) -> Message | None:
-        ...
+    async def fetch_outbound(self, message_id: str) -> Message | None: ...
 
 
 @define

src/vumi2/messages.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import Enum
-from typing import Any, Union
+from typing import Any
 from uuid import uuid4
 
 import cattrs
@@ -169,4 +169,4 @@ def deserialise(cls: "type[Event]", data: dict[str, Any]) -> "Event":
         return cattrs.structure(data, cls)
 
 
-MessageType = Union[Message, Event]
+MessageType = Message | Event

src/vumi2/transports/smpp/processors.py

@@ -117,14 +117,12 @@ class SubmitShortMessageProcessorConfig:
 
 
 class SubmitShortMessageProcesserBase:  # pragma: no cover
-    def __init__(self, config: dict, sequencer: Sequencer) -> None:
-        ...
+    def __init__(self, config: dict, sequencer: Sequencer) -> None: ...
 
     async def handle_outbound_message(  # type: ignore
         self,
         message: Message,
-    ) -> list[PDU]:
-        ...
+    ) -> list[PDU]: ...
 
 
 class SubmitShortMessageProcessor(SubmitShortMessageProcesserBase):
@@ -280,14 +278,12 @@ async def _submit_sm(self, **kwargs):
 
 
 class DeliveryReportProcesserBase:  # pragma: no cover
-    def __init__(self, config: dict) -> None:
-        ...
+    def __init__(self, config: dict) -> None: ...
 
     async def handle_deliver_sm(  # type: ignore
         self,
         pdu: DeliverSM,
-    ) -> tuple[bool, Event | None]:
-        ...
+    ) -> tuple[bool, Event | None]: ...
 
 
 DELIVERY_REPORT_REGEX = (
@@ -436,11 +432,9 @@ async def handle_deliver_sm(self, pdu: DeliverSM) -> tuple[bool, Event | None]:
 
 
 class ShortMessageProcesserBase:  # pragma: no cover
-    def __init__(self, config: dict, smpp_cache: BaseSmppCache) -> None:
-        ...
+    def __init__(self, config: dict, smpp_cache: BaseSmppCache) -> None: ...
 
-    async def handle_deliver_sm(self, pdu: DeliverSM) -> Message | None:
-        ...
+    async def handle_deliver_sm(self, pdu: DeliverSM) -> Message | None: ...
 
 
 @define

src/vumi2/transports/smpp/sequencers.py

@@ -2,8 +2,7 @@
 
 
 class Sequencer:  # pragma: no cover
-    def __init__(self, config: dict):
-        ...
+    def __init__(self, config: dict): ...
 
     async def get_next_sequence_number(self) -> int:  # type: ignore
         ...

src/vumi2/transports/smpp/smpp_cache.py

@@ -5,24 +5,19 @@
 
 
 class BaseSmppCache:  # pragma: no cover
-    def __init__(self, config: dict) -> None:
-        ...
+    def __init__(self, config: dict) -> None: ...
 
     async def store_multipart(
         self, ref_num: int, tot_num: int, part_num: int, content: str
-    ) -> str | None:
-        ...
+    ) -> str | None: ...
 
     async def store_smpp_message_id(
         self, vumi_message_id: str, smpp_message_id: str
-    ) -> None:
-        ...
+    ) -> None: ...
 
-    async def delete_smpp_message_id(self, smpp_message_id: str) -> None:
-        ...
+    async def delete_smpp_message_id(self, smpp_message_id: str) -> None: ...
 
-    async def get_smpp_message_id(self, smpp_message_id: str) -> str | None:
-        ...
+    async def get_smpp_message_id(self, smpp_message_id: str) -> str | None: ...
 
 
 @define

tests/test_config.py

@@ -111,12 +111,14 @@ def test_load_config():
     os.environ["AMQP_HOSTNAME"] = "localhost"
     with NamedTemporaryFile("w") as f:
         os.environ["VUMI_CONFIG_FILE"] = f.name
-        f.write("""
+        f.write(
+            """
             amqp:
                 hostname: overwritten
                 port: 1234
             worker_concurrency: 10
-            """)
+            """
+        )
         f.flush()
         config = load_config(cli=cli)
 

tests/test_workers.py

@@ -1,5 +1,4 @@
 import importlib.metadata
-from typing import Optional
 
 import pytest
 import sentry_sdk
@@ -80,7 +79,7 @@ class SlowSetupWorker(BaseWorker):
     """
 
     async def setup(self):
-        self.s_exc, self.exc = open_memory_channel[Optional[Exception]](1)
+        self.s_exc, self.exc = open_memory_channel[Exception | None](1)
         await self.setup_receive_inbound_connector("ri", self.handle_in, self.handle_ev)
         await sleep(0.1)
         await self.setup_receive_outbound_connector("ro", self.handle_out)