Merge pull request #691 from mosquito/hotfix/issue-669

Author: mosquito

.github/workflows/docs.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
-      - name: Setup Python 3.12
+      - name: Setup Python 3.14
         uses: actions/setup-python@v6
         with:
-          python-version: "3.12"
+          python-version: "3.14"
       - uses: astral-sh/setup-uv@v5
       - name: Install Dependencies
         run: uv sync

.github/workflows/tests.yml

@@ -13,23 +13,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - name: Setup python3.10
+      - name: Setup python3.14
         uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.14"
       - uses: astral-sh/setup-uv@v5
       - run: uv sync
       - run: uv run ruff check
         env:
           FORCE_COLOR: 1
+      - run: uv run ruff format --check
+        env:
+          FORCE_COLOR: 1
   mypy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - name: Setup python3.10
+      - name: Setup python3.14
         uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.14"
       - uses: astral-sh/setup-uv@v5
       - run: uv sync
       - run: uv run mypy

aio_pika/__init__.py

@@ -14,6 +14,7 @@
 
 
 from importlib.metadata import Distribution
+
 __version__ = Distribution.from_name("aio-pika").version
 
 

aio_pika/abc.py

@@ -9,9 +9,23 @@
 from functools import singledispatch
 from types import TracebackType
 from typing import (
-    Any, AsyncContextManager, AsyncIterable, Awaitable, Callable, Dict,
-    Generator, Iterator, Literal, Mapping, Optional, Tuple, Type, TypedDict,
-    TypeVar, Union, overload,
+    Any,
+    AsyncContextManager,
+    AsyncIterable,
+    Awaitable,
+    Callable,
+    Dict,
+    Generator,
+    Iterator,
+    Literal,
+    Mapping,
+    Optional,
+    Tuple,
+    Type,
+    TypedDict,
+    TypeVar,
+    Union,
+    overload,
 )
 
 import aiormq.abc
@@ -21,7 +35,10 @@
 
 from .pool import PoolInstance
 from .tools import (
-    CallbackCollection, CallbackSetType, CallbackType, OneShotCallback,
+    CallbackCollection,
+    CallbackSetType,
+    CallbackType,
+    OneShotCallback,
 )
 
 
@@ -80,18 +97,21 @@ class AbstractTransaction:
 
     @abstractmethod
     async def select(
-        self, timeout: TimeoutType = None,
+        self,
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Tx.SelectOk:
         raise NotImplementedError
 
     @abstractmethod
     async def rollback(
-        self, timeout: TimeoutType = None,
+        self,
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Tx.RollbackOk:
         raise NotImplementedError
 
     async def commit(
-        self, timeout: TimeoutType = None,
+        self,
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Tx.CommitOk:
         raise NotImplementedError
 
@@ -280,7 +300,8 @@ def __init__(
 
     @abstractmethod
     async def declare(
-        self, timeout: TimeoutType = None,
+        self,
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Queue.DeclareOk:
         raise NotImplementedError
 
@@ -319,42 +340,55 @@ async def consume(
 
     @abstractmethod
     async def cancel(
-        self, consumer_tag: ConsumerTag,
+        self,
+        consumer_tag: ConsumerTag,
         timeout: TimeoutType = None,
         nowait: bool = False,
     ) -> aiormq.spec.Basic.CancelOk:
         raise NotImplementedError
 
     @overload
     async def get(
-        self, *, no_ack: bool = False,
-        fail: Literal[True] = ..., timeout: TimeoutType = ...,
-    ) -> AbstractIncomingMessage:
-        ...
+        self,
+        *,
+        no_ack: bool = False,
+        fail: Literal[True] = ...,
+        timeout: TimeoutType = ...,
+    ) -> AbstractIncomingMessage: ...
 
     @overload
     async def get(
-        self, *, no_ack: bool = False,
-        fail: Literal[False] = ..., timeout: TimeoutType = ...,
-    ) -> Optional[AbstractIncomingMessage]:
-        ...
+        self,
+        *,
+        no_ack: bool = False,
+        fail: Literal[False] = ...,
+        timeout: TimeoutType = ...,
+    ) -> Optional[AbstractIncomingMessage]: ...
 
     @abstractmethod
     async def get(
-        self, *, no_ack: bool = False,
-        fail: bool = True, timeout: TimeoutType = 5,
+        self,
+        *,
+        no_ack: bool = False,
+        fail: bool = True,
+        timeout: TimeoutType = 5,
     ) -> Optional[AbstractIncomingMessage]:
         raise NotImplementedError
 
     @abstractmethod
     async def purge(
-        self, no_wait: bool = False, timeout: TimeoutType = None,
+        self,
+        no_wait: bool = False,
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Queue.PurgeOk:
         raise NotImplementedError
 
     @abstractmethod
     async def delete(
-        self, *, if_unused: bool = True, if_empty: bool = True,
+        self,
+        *,
+        if_unused: bool = True,
+        if_empty: bool = True,
         timeout: TimeoutType = None,
     ) -> aiormq.spec.Queue.DeleteOk:
         raise NotImplementedError
@@ -424,7 +458,8 @@ def __init__(
 
     @abstractmethod
     async def declare(
-        self, timeout: TimeoutType = None,
+        self,
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Exchange.DeclareOk:
         raise NotImplementedError
 
@@ -463,7 +498,9 @@ async def publish(
 
     @abstractmethod
     async def delete(
-        self, if_unused: bool = False, timeout: TimeoutType = None,
+        self,
+        if_unused: bool = False,
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Exchange.DeleteOk:
         raise NotImplementedError
 
@@ -475,8 +512,10 @@ class UnderlayChannel:
 
     @classmethod
     async def create(
-        cls, connection: aiormq.abc.AbstractConnection,
-        close_callback: Callable[..., Awaitable[Any]], **kwargs: Any,
+        cls,
+        connection: aiormq.abc.AbstractConnection,
+        close_callback: Callable[..., Awaitable[Any]],
+        **kwargs: Any,
     ) -> "UnderlayChannel":
         close_callback = OneShotCallback(close_callback)
 
@@ -586,7 +625,10 @@ async def declare_exchange(
 
     @abstractmethod
     async def get_exchange(
-        self, name: str, *, ensure: bool = True,
+        self,
+        name: str,
+        *,
+        ensure: bool = True,
     ) -> AbstractExchange:
         raise NotImplementedError
 
@@ -606,7 +648,10 @@ async def declare_queue(
 
     @abstractmethod
     async def get_queue(
-        self, name: str, *, ensure: bool = True,
+        self,
+        name: str,
+        *,
+        ensure: bool = True,
     ) -> AbstractQueue:
         raise NotImplementedError
 
@@ -662,22 +707,31 @@ class UnderlayConnection:
 
     @classmethod
     async def make_connection(
-        cls, url: URL, timeout: TimeoutType = None, **kwargs: Any,
+        cls,
+        url: URL,
+        timeout: TimeoutType = None,
+        **kwargs: Any,
     ) -> aiormq.abc.AbstractConnection:
         connection: aiormq.abc.AbstractConnection = await asyncio.wait_for(
-            aiormq.connect(url, **kwargs), timeout=timeout,
+            aiormq.connect(url, **kwargs),
+            timeout=timeout,
         )
         await connection.ready()
         return connection
 
     @classmethod
     async def connect(
-        cls, url: URL, close_callback: Callable[..., Awaitable[Any]],
-        timeout: TimeoutType = None, **kwargs: Any,
+        cls,
+        url: URL,
+        close_callback: Callable[..., Awaitable[Any]],
+        timeout: TimeoutType = None,
+        **kwargs: Any,
     ) -> "UnderlayConnection":
         try:
             connection = await cls.make_connection(
-                url, timeout=timeout, **kwargs,
+                url,
+                timeout=timeout,
+                **kwargs,
             )
             close_callback = OneShotCallback(close_callback)
             connection.closing.add_done_callback(close_callback)
@@ -736,7 +790,9 @@ class AbstractConnection(PoolInstance, ABC):
 
     @abstractmethod
     def __init__(
-        self, url: URL, loop: Optional[asyncio.AbstractEventLoop] = None,
+        self,
+        url: URL,
+        loop: Optional[asyncio.AbstractEventLoop] = None,
         **kwargs: Any,
     ):
         raise NotImplementedError(
@@ -793,8 +849,11 @@ async def __aexit__(
 
     @abstractmethod
     async def update_secret(
-        self, new_secret: str, *,
-        reason: str = "", timeout: TimeoutType = None,
+        self,
+        new_secret: str,
+        *,
+        reason: str = "",
+        timeout: TimeoutType = None,
     ) -> aiormq.spec.Connection.UpdateSecretOk:
         raise NotImplementedError
 
@@ -916,19 +975,20 @@ def channel(
 
 
 ChannelCloseCallback = Callable[
-    [Optional[AbstractChannel], Optional[BaseException]], Any,
+    [Optional[AbstractChannel], Optional[BaseException]],
+    Any,
 ]
 ConnectionCloseCallback = Callable[
-    [Optional[AbstractConnection], Optional[BaseException]], Any,
+    [Optional[AbstractConnection], Optional[BaseException]],
+    Any,
 ]
 ConnectionType = TypeVar("ConnectionType", bound=AbstractConnection)
 
 
 @singledispatch
 def get_exchange_name(value: Any) -> str:
     raise ValueError(
-        "exchange argument must be an exchange "
-        f"instance or str not {value!r}",
+        f"exchange argument must be an exchange instance or str not {value!r}",
     )