| 1 |
commit: ec399d9868227d0a012e95a8fe88799437590f84 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 13 11:31:21 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 13 11:33:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec399d98 |
| 7 |
|
| 8 |
dev-python/setuptools: Reenable py2.7 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/setuptools/setuptools-46.2.0.ebuild | 7 ++++--- |
| 13 |
profiles/package.mask | 2 +- |
| 14 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/setuptools/setuptools-46.2.0.ebuild b/dev-python/setuptools/setuptools-46.2.0.ebuild |
| 17 |
index ff041cbacee..ef030388abe 100644 |
| 18 |
--- a/dev-python/setuptools/setuptools-46.2.0.ebuild |
| 19 |
+++ b/dev-python/setuptools/setuptools-46.2.0.ebuild |
| 20 |
@@ -3,7 +3,7 @@ |
| 21 |
|
| 22 |
EAPI=7 |
| 23 |
DISTUTILS_USE_SETUPTOOLS=no |
| 24 |
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) |
| 25 |
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) |
| 26 |
PYTHON_REQ_USE="xml(+)" |
| 27 |
|
| 28 |
inherit distutils-r1 |
| 29 |
@@ -48,8 +48,9 @@ python_prepare_all() { |
| 30 |
# don't run integration tests |
| 31 |
rm setuptools/tests/test_integration.py || die |
| 32 |
|
| 33 |
- # xpass-es for me |
| 34 |
- sed -i -e '/xfail.*710/d' setuptools/tests/test_archive_util.py || die |
| 35 |
+ # xpass-es for me on py3 |
| 36 |
+ sed -e '/xfail.*710/s:(:(six.PY2, :' \ |
| 37 |
+ -i setuptools/tests/test_archive_util.py || die |
| 38 |
|
| 39 |
# avoid pointless dep on flake8 |
| 40 |
sed -i -e 's:--flake8::' pytest.ini || die |
| 41 |
|
| 42 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 43 |
index 97708f1d6eb..55bb1aa73e3 100644 |
| 44 |
--- a/profiles/package.mask |
| 45 |
+++ b/profiles/package.mask |
| 46 |
@@ -834,7 +834,7 @@ www-plugins/passff |
| 47 |
# The new version loses Python 2 support but does not introduce any real |
| 48 |
# changes. Let's mask it to reduce the noise, and hopefully try to get |
| 49 |
# python2_7 out of default PYTHON_TARGETS first. |
| 50 |
->=dev-python/setuptools-45.0.0 |
| 51 |
+~dev-python/setuptools-46.1.3 |
| 52 |
|
| 53 |
# Mikle Kolyada <zlogene@g.o> (2020-01-13) |
| 54 |
# Current versioning breaks portage logic and prevents |
Archives