Merge pull request #692 from zware/dep_update

chore: Dependency-related updates

Author: mosquito

.github/workflows/docs.yml

@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Setup Python 3.12
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: "3.12"
       - name: Cache virtualenv
         id: venv-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-3.12
@@ -28,7 +28,7 @@ jobs:
       - name: Install Poetry
         run: python -m pip install poetry
       - name: Cache Poetry and pip
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: |
             ~/.cache/pypoetry

.github/workflows/tests.yml

@@ -12,14 +12,14 @@ jobs:
   pylama:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Setup python3.10
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Cache virtualenv
         id: venv-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
@@ -31,14 +31,14 @@ jobs:
   mypy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Setup python3.10
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Cache virtualenv
         id: venv-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
@@ -60,15 +60,16 @@ jobs:
           - '3.11'
           - '3.12'
           - '3.13'
+          - '3.14'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Setup python${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: "${{ matrix.python }}"
       - name: Cache virtualenv
         id: venv-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ matrix.python }}

aio_pika/tools.py

@@ -7,22 +7,14 @@
 from itertools import chain
 from threading import Lock
 from typing import (
-    AbstractSet, Any, Awaitable, Callable, Coroutine, Generator, Iterator,
-    List,
-    MutableSet, Optional, TypeVar, Union, Generic,
+    AbstractSet, Any, Awaitable, Callable, Coroutine, Generator, Generic,
+    Iterator, List, MutableSet, Optional, ParamSpec, Protocol, TypeVar, Union,
 )
-
 from weakref import ReferenceType, WeakSet, ref
 
 from aio_pika.log import get_logger
 
 
-try:
-    from typing import ParamSpec, Protocol
-except ImportError:
-    from typing_extensions import ParamSpec, Protocol   # type: ignore
-
-
 log = get_logger(__name__)
 T = TypeVar("T")
 

poetry.lock

@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: Python",
@@ -39,7 +40,6 @@ python = "^3.10"
 aiormq = "^6.8"
 yarl = [{ version = '*'}]
 exceptiongroup = [{ version = "^1", python = "< 3.11" }]
-typing-extensions = [{ version = '*', python = "< 3.10" }]
 
 [tool.poetry.group.dev.dependencies]
 aiomisc = "^17.5"
@@ -57,8 +57,7 @@ shortuuid = "^1.0"
 sphinx = "*"
 sphinx-autobuild = "^2021.3.14"
 timeout-decorator = "^0.5.0"
-types-setuptools = "^65.6.0.2"
-typing-extensions = "*"
+# Seems to be implicitly required by pylama
 setuptools = "^69.0.3"
 testcontainers = "^3.7.1"
 autodoc = "*"

pyproject.toml

@@ -1,7 +1,6 @@
 import gc
 import weakref
 from functools import partial
-from typing import AbstractSet
 
 import pytest
 
@@ -13,7 +12,7 @@
 async def test_leak_unclosed_channel(create_connection):
     rabbitmq_connection = await create_connection()
 
-    weakset: AbstractSet[aio_pika.abc.AbstractChannel] = weakref.WeakSet()
+    weakset: weakref.WeakSet[aio_pika.abc.AbstractChannel] = weakref.WeakSet()
 
     async def f(rabbitmq_connection: aio_pika.Connection, weakset):
         weakset.add(await rabbitmq_connection.channel())
@@ -30,7 +29,9 @@ async def f(rabbitmq_connection: aio_pika.Connection, weakset):
 async def test_leak_closed_channel(create_connection):
     rabbitmq_connection = await create_connection()
 
-    weakset: AbstractSet[aio_pika.abc.AbstractConnection] = weakref.WeakSet()
+    weakset: weakref.WeakSet[aio_pika.abc.AbstractConnection] = (
+        weakref.WeakSet()
+    )
 
     async def f(rabbitmq_connection: aio_pika.Connection, weakset):
         async with rabbitmq_connection.channel() as channel:
@@ -64,7 +65,7 @@ async def test_get_exchange_no_memory_leak(create_robust_connection):
     """
     connection = await create_robust_connection()
 
-    weakset: AbstractSet[aio_pika.abc.AbstractExchange] = weakref.WeakSet()
+    weakset: weakref.WeakSet[aio_pika.abc.AbstractExchange] = weakref.WeakSet()
 
     async with connection:
         channel: RobustChannel = await connection.channel()  # type: ignore
@@ -87,7 +88,10 @@ async def test_get_exchange_no_memory_leak(create_robust_connection):
         # Verify internal storage doesn't grow
         assert name in channel._exchanges
         # Should be a single exchange, not a set/list of exchanges
-        assert isinstance(channel._exchanges[name], aio_pika.abc.AbstractExchange)
+        assert isinstance(
+            channel._exchanges[name],
+            aio_pika.abc.AbstractExchange
+        )
 
 
 async def test_get_queue_no_memory_leak(create_robust_connection):
@@ -99,7 +103,7 @@ async def test_get_queue_no_memory_leak(create_robust_connection):
     """
     connection = await create_robust_connection()
 
-    weakset: AbstractSet[aio_pika.abc.AbstractQueue] = weakref.WeakSet()
+    weakset: weakref.WeakSet[aio_pika.abc.AbstractQueue] = weakref.WeakSet()
 
     async with connection:
         channel: RobustChannel = await connection.channel()  # type: ignore