[gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-collections/, dev-python/jaraco-collections/files/
commit: 7796c84c6873e6bfa0d6e889f0110ecb5824f948
Author: Michał Górny gentoo org>
AuthorDate: Thu Aug 12 04:43:39 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Aug 12 05:21:40 2021 +
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..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-collections/, dev-python/jaraco-collections/files/
commit: 56b7b2d4280e07a09e2d0547eb18330ea159d7a6
Author: Patrick McLean sony com>
AuthorDate: Thu Mar 26 21:32:22 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Mar 26 22:39:03 2020 +
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 000..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" \
