Merge pull request #682 from mosquito/aiormq-update

aiormq>=6.8,<7

Author: mosquito

.github/workflows/tests.yml

@@ -56,7 +56,6 @@ jobs:
 
       matrix:
         python:
-          - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'

aio_pika/robust_channel.py

@@ -23,7 +23,7 @@
 log = get_logger(__name__)
 
 
-class RobustChannel(Channel, AbstractRobustChannel):    # type: ignore
+class RobustChannel(Channel, AbstractRobustChannel):
     """ Channel abstraction """
 
     QUEUE_CLASS: Type[Queue] = RobustQueue

aio_pika/tools.py

@@ -336,7 +336,7 @@ def ensure_awaitable(
 
     @wraps(func)
     async def wrapper(*args: _Params.args, **kwargs: _Params.kwargs) -> T:
-        nonlocal func
+        nonlocal func       # noqa
 
         result = func(*args, **kwargs)
         if not hasattr(result, "__await__"):

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aio-pika"
-version = "9.5.6"
+version = "9.5.7"
 description = "Wrapper around the aiormq for asyncio and humans"
 authors = ["Dmitry Orlov <me@mosquito.su>"]
 readme = "README.rst"
@@ -15,7 +15,6 @@ classifiers = [
     "Operating System :: Microsoft",
     "Operating System :: POSIX",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -36,8 +35,8 @@ packages = [{ include = "aio_pika" }]
 "Documentation" = "https://docs.aio-pika.com/"
 
 [tool.poetry.dependencies]
-python = "^3.9"
-aiormq = "~6.8"
+python = "^3.10"
+aiormq = "^6.8"
 yarl = [{ version = '*'}]
 exceptiongroup = [{ version = "^1", python = "< 3.11" }]
 typing-extensions = [{ version = '*', python = "< 3.10" }]

pyproject.toml

@@ -22,7 +22,6 @@ async def add_cleanup(event_loop):
     entities = []
 
     def payload(func, *args, **kwargs):
-        nonlocal entities
         func = partial(awaitable(func), *args, **kwargs)
         entities.append(func)
 
@@ -40,7 +39,6 @@ async def create_task(event_loop):
     tasks = []
 
     def payload(coroutine):
-        nonlocal tasks
         task = event_loop.create_task(coroutine)
         tasks.append(task)
         return task
@@ -145,8 +143,6 @@ def create_channel(connection: aio_pika.Connection, add_cleanup):
     conn = connection
 
     async def fabric(cleanup=True, connection=None, *args, **kwargs):
-        nonlocal add_cleanup, conn
-
         if connection is None:
             connection = conn
 
@@ -182,8 +178,6 @@ def declare_queue(connection, channel, add_cleanup):
     async def fabric(
         *args, cleanup=True, channel=None, **kwargs,
     ) -> aio_pika.Queue:
-        nonlocal ch, add_cleanup
-
         if channel is None:
             channel = ch
 
@@ -204,8 +198,6 @@ def declare_exchange(connection, channel, add_cleanup):
     async def fabric(
         *args, channel=None, cleanup=True, **kwargs,
     ) -> aio_pika.Exchange:
-        nonlocal ch, add_cleanup
-
         if channel is None:
             channel = ch
 

tests/conftest.py

@@ -63,7 +63,7 @@ def on_close(
             ch: Optional[aio_pika.abc.AbstractChannel],
             exc: Optional[BaseException] = None,
         ):
-            nonlocal event, closed
+            nonlocal closed
             log.info("Close called")
             closed = True
             assert ch is not None
@@ -1450,10 +1450,7 @@ async def test_queue_iterator_close_was_called_twice(
         iterator: QueueIterator
 
         async def task_inner():
-            nonlocal event
             nonlocal iterator
-            nonlocal create_connection
-
             connection = await create_connection()
 
             async with connection:
@@ -1488,10 +1485,6 @@ async def test_queue_iterator_close_with_noack(
         body = get_random_name("test_body").encode()
 
         async def task_inner():
-            nonlocal messages
-            nonlocal create_connection
-            nonlocal add_cleanup
-
             connection = await create_connection()
             add_cleanup(connection.close)
 

tests/test_amqp.py

@@ -23,13 +23,13 @@ def create_connection(connection_fabric, event_loop, amqp_url):
     return partial(connection_fabric, amqp_url, loop=event_loop)
 
 
-class TestCaseNoRobust(TestCaseAmqp):
+class TestCaseNoRobust(TestCaseAmqp):   # type: ignore
     PARAMS = [{"robust": True}, {"robust": False}]
     IDS = ["robust=1", "robust=0"]
 
     @staticmethod
     @pytest.fixture(name="declare_queue", params=PARAMS, ids=IDS)
-    def declare_queue_(request, declare_queue):
+    def declare_queue_(request, declare_queue):     # type: ignore
         async def fabric(*args, **kwargs) -> aio_pika.Queue:
             kwargs.update(request.param)
             return await declare_queue(*args, **kwargs)
@@ -38,7 +38,7 @@ async def fabric(*args, **kwargs) -> aio_pika.Queue:
 
     @staticmethod
     @pytest.fixture(name="declare_exchange", params=PARAMS, ids=IDS)
-    def declare_exchange_(request, declare_exchange):
+    def declare_exchange_(request, declare_exchange):   # type: ignore
         async def fabric(*args, **kwargs) -> aio_pika.Queue:
             kwargs.update(request.param)
             return await declare_exchange(*args, **kwargs)

tests/test_amqp_robust.py

@@ -180,8 +180,6 @@ async def test_robust_reconnect(
             consumer_event = asyncio.Event()
 
             async def reader(queue_name):
-                nonlocal shared
-
                 try:
                     queue = await read_channel.declare_queue(
                         name=queue_name, passive=True,
@@ -377,8 +375,6 @@ async def test_robust_duplicate_queue(
 
     # noinspection PyShadowingNames
     async def reader(queue: aio_pika.Queue):
-        nonlocal shared
-
         async with queue.iterator() as q:
             async for message in q:
                 # https://www.rabbitmq.com/confirms.html#automatic-requeueing

tests/test_amqp_robust_proxy.py

@@ -17,7 +17,6 @@ async def test_simple(self, channel: aio_pika.Channel):
         self.state: List[Any] = []
 
         def worker_func(*, foo, bar):
-            nonlocal event
             self.state.append((foo, bar))
             event.set()
 
@@ -40,7 +39,6 @@ async def test_simple_coro(self, channel: aio_pika.Channel):
         self.state = []
 
         async def worker_func(*, foo, bar):
-            nonlocal event
             self.state.append((foo, bar))
             event.set()
 
@@ -63,8 +61,7 @@ async def test_simple_many(self, channel: aio_pika.Channel):
         state = []
 
         def worker_func(*, foo):
-            nonlocal tasks, state
-
+            nonlocal tasks
             state.append(foo)
             tasks -= 1