| 1 |
commit: ad1aaaf223c6a45db1df030819fc8f2e57bcf754 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 15 07:58:51 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 15 08:01:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1aaaf2 |
| 7 |
|
| 8 |
dev-python/setuptools: Enable Python 3.8 |
| 9 |
|
| 10 |
Enable Python 3.8 as needed to start bootstrapping it everywhere. |
| 11 |
For now, without test deps since they cause many blockers in keywording |
| 12 |
process. However, when test deps are built without testing, setuptools' |
| 13 |
tests just pass. |
| 14 |
|
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-python/setuptools/setuptools-41.5.1.ebuild | 27 +++++++++++++++++++------- |
| 18 |
dev-python/setuptools/setuptools-9999.ebuild | 2 +- |
| 19 |
2 files changed, 21 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-python/setuptools/setuptools-41.5.1.ebuild b/dev-python/setuptools/setuptools-41.5.1.ebuild |
| 22 |
index 69da3de1a38..ff4a7aa5463 100644 |
| 23 |
--- a/dev-python/setuptools/setuptools-41.5.1.ebuild |
| 24 |
+++ b/dev-python/setuptools/setuptools-41.5.1.ebuild |
| 25 |
@@ -2,7 +2,7 @@ |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
| 30 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) |
| 31 |
PYTHON_REQ_USE="xml(+)" |
| 32 |
|
| 33 |
inherit distutils-r1 |
| 34 |
@@ -25,15 +25,19 @@ RESTRICT="!test? ( test )" |
| 35 |
|
| 36 |
RDEPEND=" |
| 37 |
" |
| 38 |
+# Temporary hack to avoid py38 keywording hell. Please remove when |
| 39 |
+# the test deps all have py38. Also setuptools' test pass with py38, |
| 40 |
+# so you need to hack them all in locally before bumping and test. |
| 41 |
+TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) |
| 42 |
DEPEND="${RDEPEND} |
| 43 |
app-arch/unzip |
| 44 |
test? ( |
| 45 |
- dev-python/mock[${PYTHON_USEDEP}] |
| 46 |
- dev-python/pip[${PYTHON_USEDEP}] |
| 47 |
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] |
| 48 |
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}] |
| 49 |
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}] |
| 50 |
- dev-python/wheel[${PYTHON_USEDEP}] |
| 51 |
+ dev-python/mock[${TEST_USEDEP}] |
| 52 |
+ dev-python/pip[${TEST_USEDEP}] |
| 53 |
+ >=dev-python/pytest-3.7.0[${TEST_USEDEP}] |
| 54 |
+ dev-python/pytest-fixture-config[${TEST_USEDEP}] |
| 55 |
+ dev-python/pytest-virtualenv[${TEST_USEDEP}] |
| 56 |
+ dev-python/wheel[${TEST_USEDEP}] |
| 57 |
virtual/python-futures[${PYTHON_USEDEP}] |
| 58 |
) |
| 59 |
" |
| 60 |
@@ -61,6 +65,15 @@ python_prepare_all() { |
| 61 |
} |
| 62 |
|
| 63 |
python_test() { |
| 64 |
+ if [[ ${EPYTHON} == python3.8 ]]; then |
| 65 |
+ if [[ ${PV} != 41.5.1 ]]; then |
| 66 |
+ eerror "Please disable py38 hacks and test locally, then update this." |
| 67 |
+ die "Python 3.8 support untested for ${PV}" |
| 68 |
+ fi |
| 69 |
+ einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps" |
| 70 |
+ return |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg |
| 74 |
# It tries to sandbox the test in a tempdir |
| 75 |
HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" |
| 76 |
|
| 77 |
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild |
| 78 |
index 69da3de1a38..8d522c4213f 100644 |
| 79 |
--- a/dev-python/setuptools/setuptools-9999.ebuild |
| 80 |
+++ b/dev-python/setuptools/setuptools-9999.ebuild |
| 81 |
@@ -2,7 +2,7 @@ |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
EAPI=7 |
| 85 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
| 86 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) |
| 87 |
PYTHON_REQ_USE="xml(+)" |
| 88 |
|
| 89 |
inherit distutils-r1 |
Archives