drop 3.5 support

.github/workflows/tox.yml

@@ -46,12 +46,10 @@ jobs:
 
       matrix:
         toxenv:
-          - py35
           - py36
           - py37
           - py38
           - py39
-          - py35-uvloop
           - py36-uvloop
           - py37-uvloop
           - py38-uvloop

setup.py

@@ -29,21 +29,20 @@
         "Operating System :: Microsoft",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
     packages=find_packages(exclude=["tests"]),
     package_data={"aio_pika": ["py.typed"]},
-    install_requires=["aiormq>=3.2.3,<4", "yarl"],
-    python_requires=">3.5.*, <4",
+    install_requires=["aiormq~=4.0", "yarl"],
+    python_requires=">3.6.*, <4",
     extras_require={
         "develop": [
             "aiomisc~=10.1.6",
-            "async_generator",
             "coverage!=4.3",
             "coveralls",
             "pylava",

tests/conftest.py

@@ -9,15 +9,13 @@
 import pamqp
 import pytest
 from aiomisc import awaitable
-from async_generator import async_generator, yield_
 from yarl import URL
 
 import aio_pika
 from aiormq.connection import DEFAULT_PORTS
 
 
 @pytest.fixture
-@async_generator
 async def add_cleanup(loop):
     entities = []
 
@@ -27,7 +25,7 @@ def payload(func, *args, **kwargs):
         entities.append(func)
 
     try:
-        await yield_(payload)
+        yield payload
     finally:
         for func in entities[::-1]:
             await func()
@@ -36,7 +34,6 @@ def payload(func, *args, **kwargs):
 
 
 @pytest.fixture
-@async_generator
 async def create_task(loop):
     tasks = []
 
@@ -47,7 +44,7 @@ def payload(coroutine):
         return task
 
     try:
-        await yield_(payload)
+        yield payload
     finally:
         cancelled = []
         for task in tasks:
@@ -117,18 +114,16 @@ async def fabric(cleanup=True, connection=None, *args, **kwargs):
 
 # noinspection PyTypeChecker
 @pytest.fixture
-@async_generator
 async def connection(create_connection) -> aio_pika.Connection:
     async with await create_connection() as conn:
-        await yield_(conn)
+        yield conn
 
 
 # noinspection PyTypeChecker
 @pytest.fixture
-@async_generator
 async def channel(connection: aio_pika.Connection) -> aio_pika.Channel:
     async with connection.channel() as ch:
-        await yield_(ch)
+        yield ch
 
 
 @pytest.fixture

tests/test_amqp_robust_proxy.py

@@ -9,7 +9,6 @@
 import pytest
 import shortuuid
 from aiomisc_pytest.pytest_plugin import TCPProxy
-from async_generator import async_generator, yield_
 from yarl import URL
 
 import aio_pika
@@ -21,13 +20,12 @@
 
 
 @pytest.fixture
-@async_generator
 async def proxy(tcp_proxy: Type[TCPProxy], amqp_direct_url: URL):
     p = tcp_proxy(amqp_direct_url.host, amqp_direct_url.port)
 
     await p.start()
     try:
-        await yield_(p)
+        yield p
     finally:
         await p.close()
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint,py3{5,6,7},py3{5,6,7}-{uvloop}
+envlist = lint,py3{6,7,8,9},py3{6,7,8}-{uvloop}
 
 [testenv]
 passenv = COVERALLS_* AMQP_*