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 6C165139360 for ; Thu, 12 Aug 2021 05:21:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FD17E0918; Thu, 12 Aug 2021 05:21:47 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 62301E0916 for ; Thu, 12 Aug 2021 05:21:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 154F4342F12 for ; Thu, 12 Aug 2021 05:21:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 793F189F for ; Thu, 12 Aug 2021 05:21:44 +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: <1628745700.7796c84c6873e6bfa0d6e889f0110ecb5824f948.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-collections/, dev-python/jaraco-collections/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild X-VCS-Directories: dev-python/jaraco-collections/files/ dev-python/jaraco-collections/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7796c84c6873e6bfa0d6e889f0110ecb5824f948 X-VCS-Branch: master Date: Thu, 12 Aug 2021 05:21:44 +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: e8a3d01a-d206-41ad-a335-07d8a6b366aa X-Archives-Hash: 4643ec54263addcf90601b10180eccae commit: 7796c84c6873e6bfa0d6e889f0110ecb5824f948 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 12 04:43:39 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Aug 12 05:21:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7796c84c dev-python/jaraco-collections: Remove pypy3 for the time being Remove pypy3 and the relevant patch until the problem is resolved upstream. Apparently it was not even reported before, and the package does not have any pypy3-revdeps. Signed-off-by: Michał Górny gentoo.org> .../files/jaraco-collections-3.0.0-pypy.patch | 30 ---------------------- .../jaraco-collections-3.3.0.ebuild | 6 +---- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch b/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch deleted file mode 100644 index 63cee6cb411..00000000000 --- a/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/jaraco/collections.py b/jaraco/collections.py -index 3ab9dc9..6a6e342 100644 ---- a/jaraco/collections.py -+++ b/jaraco/collections.py -@@ -4,6 +4,7 @@ import collections.abc - import itertools - import copy - import functools -+import platform - - from jaraco.classes.properties import NonDataProperty - import jaraco.text -@@ -592,9 +593,14 @@ class DictStack(list, collections.abc.Mapping): - return list(set(itertools.chain.from_iterable(c.keys() for c in self))) - - def __getitem__(self, key): -- for scope in reversed(self): -- if key in scope: -- return scope[key] -+ if 'PyPy' in platform.python_implementation(): -+ for scope in reversed(list(self)): -+ if key in scope: -+ return scope[key] -+ else: -+ for scope in reversed(self): -+ if key in scope: -+ return scope[key] - raise KeyError(key) - - push = list.append diff --git a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild index a894279bf7a..29c60505c72 100644 --- a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild +++ b/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..10} pypy3 ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 MY_PN="${PN/-/.}" @@ -24,10 +24,6 @@ BDEPEND=" >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] " -PATCHES=( - "${FILESDIR}/jaraco-collections-3.0.0-pypy.patch" -) - distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \ '>=dev-python/rst-linker-1.9' distutils_enable_tests pytest