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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 094DE158043 for ; Sat, 13 Apr 2024 05:35:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD07CE2A34; Sat, 13 Apr 2024 05:35:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B31E0E2A34 for ; Sat, 13 Apr 2024 05:35:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0703E34315B for ; Sat, 13 Apr 2024 05:35:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82C9216E2 for ; Sat, 13 Apr 2024 05:35:34 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1712986510.e5cacb67a9e256438731422e14384c16dd0a3897.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/aiohttp-cors/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild X-VCS-Directories: dev-python/aiohttp-cors/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: e5cacb67a9e256438731422e14384c16dd0a3897 X-VCS-Branch: master Date: Sat, 13 Apr 2024 05:35:34 +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: 101a3972-4ab1-43f4-ab72-21b57fbb7cb3 X-Archives-Hash: f95ee0d73898998ecac0495592fc49d9 commit: e5cacb67a9e256438731422e14384c16dd0a3897 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 13 05:07:53 2024 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Apr 13 05:35:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cacb67 dev-python/aiohttp-cors: Fix errors with pytest-8 Closes: https://bugs.gentoo.org/928354 Signed-off-by: Michał Górny gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/36231 Signed-off-by: Arthur Zamarin gentoo.org> .../aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild index b9f9a8493b93..3b66370dac42 100644 --- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild +++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -34,13 +34,20 @@ BDEPEND=" distutils_enable_tests pytest -PATCHES=( - # https://github.com/aio-libs/aiohttp-cors/pull/278 - "${FILESDIR}/${P}-tests.patch" - "${FILESDIR}/${P}-py3_7.patch" - # https://github.com/aio-libs/aiohttp-cors/pull/412 - "${FILESDIR}/${P}-py3_11.patch" -) +src_prepare() { + local PATCHES=( + # https://github.com/aio-libs/aiohttp-cors/pull/278 + "${FILESDIR}/${P}-tests.patch" + "${FILESDIR}/${P}-py3_7.patch" + # https://github.com/aio-libs/aiohttp-cors/pull/412 + "${FILESDIR}/${P}-py3_11.patch" + ) + + # doesn't do anything, except for breaking pytest-8 + rm conftest.py || die + + distutils-r1_src_prepare +} python_test() { local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1