From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42A36139000 for ; Thu, 29 Jul 2021 18:47:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B5E2E091D; Thu, 29 Jul 2021 18:47:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50DAAE091D for ; Thu, 29 Jul 2021 18:47:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79368342C26 for ; Thu, 29 Jul 2021 18:47:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2996584C for ; Thu, 29 Jul 2021 18:47:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1627584414.0467886b731053bc339461912e0c4efe20dccf8f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/aiohttp/, dev-python/aiohttp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch X-VCS-Directories: dev-python/aiohttp/ dev-python/aiohttp/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0467886b731053bc339461912e0c4efe20dccf8f X-VCS-Branch: master Date: Thu, 29 Jul 2021 18:47:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9acb54dd-0b7f-4249-8d46-b0e3d891f125 X-Archives-Hash: 93772fbea3236b9b7aaaccf5c2a4a4c0 commit: 0467886b731053bc339461912e0c4efe20dccf8f Author: Arthur Zamarin gmail com> AuthorDate: Sat Jul 24 16:51:26 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 29 18:46:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0467886b dev-python/aiohttp: enable py3.10 patch taken from comment here: https://github.com/aio-libs/aiohttp/issues/5905 Signed-off-by: Arthur Zamarin gmail.com> Signed-off-by: Michał Górny gentoo.org> dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild | 3 +- .../aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch | 73 ++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild index 3871075876e..4c0cea0a0d1 100644 --- a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild +++ b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 multiprocessing @@ -42,6 +42,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/aiohttp-3.7.4-brotli.patch + "${FILESDIR}"/aiohttp-3.7.4-fix-py3.10.patch ) DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst ) diff --git a/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch b/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch new file mode 100644 index 00000000000..3c7593584b7 --- /dev/null +++ b/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch @@ -0,0 +1,73 @@ +commit ec87d9f2b6541599dd7fc8aaebf0fdfbb812ade7 +Author: Louis Sautier +Date: Tue Jul 20 23:37:27 2021 +0200 + + Remove deprecated loop argument from asyncio.sleep/gather calls + +diff --git a/aiohttp/web.py b/aiohttp/web.py +index 557e3c3b..52dfdf93 100644 +--- a/aiohttp/web.py ++++ b/aiohttp/web.py +@@ -441,7 +441,7 @@ def _cancel_tasks( + task.cancel() + + loop.run_until_complete( +- asyncio.gather(*to_cancel, loop=loop, return_exceptions=True) ++ asyncio.gather(*to_cancel, return_exceptions=True) + ) + + for task in to_cancel: +diff --git a/tests/test_locks.py b/tests/test_locks.py +index 55fd2330..5f434eac 100644 +--- a/tests/test_locks.py ++++ b/tests/test_locks.py +@@ -18,7 +18,7 @@ class TestEventResultOrError: + return 1 + + t = loop.create_task(c()) +- await asyncio.sleep(0, loop=loop) ++ await asyncio.sleep(0) + e = Exception() + ev.set(exc=e) + assert (await t) == e +@@ -31,7 +31,7 @@ class TestEventResultOrError: + return 1 + + t = loop.create_task(c()) +- await asyncio.sleep(0, loop=loop) ++ await asyncio.sleep(0) + ev.set() + assert (await t) == 1 + +@@ -43,7 +43,7 @@ class TestEventResultOrError: + + t1 = loop.create_task(c()) + t2 = loop.create_task(c()) +- await asyncio.sleep(0, loop=loop) ++ await asyncio.sleep(0) + ev.cancel() + ev.set() + +diff --git a/tests/test_proxy_functional.py b/tests/test_proxy_functional.py +index 68763cd4..65c773a1 100644 +--- a/tests/test_proxy_functional.py ++++ b/tests/test_proxy_functional.py +@@ -238,7 +238,7 @@ async def test_proxy_http_multi_conn_limit(proxy_test_server, loop) -> None: + resp = await sess.get(url, proxy=proxy.url) + + current_pid = pid +- await asyncio.sleep(0.2, loop=loop) ++ await asyncio.sleep(0.2) + assert current_pid == pid + + await resp.release() +@@ -443,7 +443,7 @@ async def xtest_proxy_https_multi_conn_limit(proxy_test_server, loop): + resp = await sess.get(url, proxy=proxy.url) + + current_pid = pid +- await asyncio.sleep(0.2, loop=loop) ++ await asyncio.sleep(0.2) + assert current_pid == pid + + await resp.release() +