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 3245F138350 for ; Thu, 26 Mar 2020 22:39:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29D5DE0DF4; Thu, 26 Mar 2020 22:39:19 +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 04E1EE0DF4 for ; Thu, 26 Mar 2020 22:39:19 +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 E98E034F98A for ; Thu, 26 Mar 2020 22:39:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F72F1A8 for ; Thu, 26 Mar 2020 22:39:15 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1585262343.56b7b2d4280e07a09e2d0547eb18330ea159d7a6.chutzpah@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.0.0.ebuild X-VCS-Directories: dev-python/jaraco-collections/ dev-python/jaraco-collections/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 56b7b2d4280e07a09e2d0547eb18330ea159d7a6 X-VCS-Branch: master Date: Thu, 26 Mar 2020 22:39:15 +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: 50caaaac-8632-4652-a2b9-556ffab037ad X-Archives-Hash: a50e6a702a1d6a84726524792200f245 commit: 56b7b2d4280e07a09e2d0547eb18330ea159d7a6 Author: Patrick McLean sony com> AuthorDate: Thu Mar 26 21:32:22 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Thu Mar 26 22:39:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b7b2d4 dev-python/jaraco-collections-3.0.0: add pypy3 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Patrick McLean gentoo.org> .../files/jaraco-collections-3.0.0-pypy.patch | 30 ++++++++++++++++++++++ .../jaraco-collections-3.0.0.ebuild | 9 +++++-- 2 files changed, 37 insertions(+), 2 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 new file mode 100644 index 00000000000..63cee6cb411 --- /dev/null +++ b/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch @@ -0,0 +1,30 @@ +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.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild index 24a897750d9..e89935b5b5c 100644 --- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild +++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild @@ -33,11 +33,16 @@ BDEPEND=" >=dev-python/pytest-2.8[${PYTHON_USEDEP}] ) " -distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \ - '>=dev-python/rst-linker-1.9' S="${WORKDIR}/${MY_PN}-${PV}" +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' + python_test() { # Override pytest options to skip flake8 PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \