| 1 |
commit: 371df4e919f4c10bca9a5910092855099f18188d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 25 14:57:11 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 25 16:16:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371df4e9 |
| 7 |
|
| 8 |
dev-python/pytest: Port to py3.9 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/pytest/pytest-4.6.10.ebuild | 34 +++++++++++++++++++++------------- |
| 13 |
dev-python/pytest/pytest-5.4.2.ebuild | 25 +++++++++++++++++-------- |
| 14 |
2 files changed, 38 insertions(+), 21 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/pytest/pytest-4.6.10.ebuild b/dev-python/pytest/pytest-4.6.10.ebuild |
| 17 |
index ebd5ee83815..f2ba4fb7643 100644 |
| 18 |
--- a/dev-python/pytest/pytest-4.6.10.ebuild |
| 19 |
+++ b/dev-python/pytest/pytest-4.6.10.ebuild |
| 20 |
@@ -4,7 +4,7 @@ |
| 21 |
EAPI=7 |
| 22 |
|
| 23 |
DISTUTILS_USE_SETUPTOOLS=rdepend |
| 24 |
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) |
| 25 |
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 ) |
| 26 |
|
| 27 |
inherit distutils-r1 |
| 28 |
|
| 29 |
@@ -27,8 +27,9 @@ RDEPEND=" |
| 30 |
>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] |
| 31 |
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
| 32 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
| 33 |
- $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \ |
| 34 |
- -2 python3_{5,6,7} pypy3) |
| 35 |
+ $(python_gen_cond_dep ' |
| 36 |
+ dev-python/importlib_metadata[${PYTHON_USEDEP}] |
| 37 |
+ ' -2 python3_{5,6,7} pypy3) |
| 38 |
$(python_gen_cond_dep ' |
| 39 |
dev-python/pathlib2[${PYTHON_USEDEP}] |
| 40 |
dev-python/funcsigs[${PYTHON_USEDEP}] |
| 41 |
@@ -44,17 +45,19 @@ RDEPEND=" |
| 42 |
DEPEND=" |
| 43 |
test? ( |
| 44 |
${RDEPEND} |
| 45 |
- dev-python/argcomplete[${PYTHON_USEDEP}] |
| 46 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
| 47 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 48 |
+ $(python_gen_cond_dep ' |
| 49 |
+ dev-python/argcomplete[${PYTHON_USEDEP}] |
| 50 |
+ >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
| 51 |
+ dev-python/nose[${PYTHON_USEDEP}] |
| 52 |
+ dev-python/pexpect[${PYTHON_USEDEP}] |
| 53 |
+ dev-python/pytest-xdist[${PYTHON_USEDEP}] |
| 54 |
+ dev-python/requests[${PYTHON_USEDEP}] |
| 55 |
+ !!dev-python/flaky |
| 56 |
+ !!dev-python/pytest-aiohttp |
| 57 |
+ !!dev-python/pytest-asyncio |
| 58 |
+ !!dev-python/pytest-django |
| 59 |
+ ' python2_7 python3_{6,7,8} pypy3) |
| 60 |
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) |
| 61 |
- dev-python/pexpect[${PYTHON_USEDEP}] |
| 62 |
- dev-python/pytest-xdist[${PYTHON_USEDEP}] |
| 63 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 64 |
- !!dev-python/flaky |
| 65 |
- !!dev-python/pytest-aiohttp |
| 66 |
- !!dev-python/pytest-asyncio |
| 67 |
- !!dev-python/pytest-django |
| 68 |
)" |
| 69 |
|
| 70 |
PATCHES=( |
| 71 |
@@ -72,6 +75,11 @@ python_prepare_all() { |
| 72 |
} |
| 73 |
|
| 74 |
python_test() { |
| 75 |
+ if [[ ${EPYTHON} == python3.9 ]]; then |
| 76 |
+ einfo "Skipping py3.9 due to unported deps" |
| 77 |
+ return |
| 78 |
+ fi |
| 79 |
+ |
| 80 |
distutils_install_for_testing |
| 81 |
|
| 82 |
# In v4.1.1, pytest started being picky about its own verbosity options. |
| 83 |
|
| 84 |
diff --git a/dev-python/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild |
| 85 |
index 62074a5c20e..c53483cbfc6 100644 |
| 86 |
--- a/dev-python/pytest/pytest-5.4.2.ebuild |
| 87 |
+++ b/dev-python/pytest/pytest-5.4.2.ebuild |
| 88 |
@@ -4,7 +4,7 @@ |
| 89 |
EAPI=7 |
| 90 |
|
| 91 |
DISTUTILS_USE_SETUPTOOLS=rdepend |
| 92 |
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) |
| 93 |
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) |
| 94 |
|
| 95 |
inherit distutils-r1 |
| 96 |
|
| 97 |
@@ -25,7 +25,9 @@ PY_VER="1.5.0" |
| 98 |
# support, which only came in py3.6. |
| 99 |
RDEPEND=" |
| 100 |
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
| 101 |
- dev-python/importlib_metadata[${PYTHON_USEDEP}] |
| 102 |
+ $(python_gen_cond_dep ' |
| 103 |
+ dev-python/importlib_metadata[${PYTHON_USEDEP}] |
| 104 |
+ ' python3_{6,7} pypy3) |
| 105 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
| 106 |
dev-python/packaging[${PYTHON_USEDEP}] |
| 107 |
>=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
| 108 |
@@ -37,12 +39,14 @@ RDEPEND=" |
| 109 |
# flake cause a number of tests to fail |
| 110 |
DEPEND="${RDEPEND} |
| 111 |
test? ( |
| 112 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
| 113 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 114 |
- dev-python/mock[${PYTHON_USEDEP}] |
| 115 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 116 |
- dev-python/xmlschema[${PYTHON_USEDEP}] |
| 117 |
- !!dev-python/flaky |
| 118 |
+ $(python_gen_cond_dep ' |
| 119 |
+ >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
| 120 |
+ dev-python/nose[${PYTHON_USEDEP}] |
| 121 |
+ dev-python/mock[${PYTHON_USEDEP}] |
| 122 |
+ dev-python/requests[${PYTHON_USEDEP}] |
| 123 |
+ dev-python/xmlschema[${PYTHON_USEDEP}] |
| 124 |
+ !!dev-python/flaky |
| 125 |
+ ' python2_7 python3_{6,7,8} pypy3) |
| 126 |
)" |
| 127 |
|
| 128 |
PATCHES=( |
| 129 |
@@ -61,6 +65,11 @@ python_prepare_all() { |
| 130 |
} |
| 131 |
|
| 132 |
python_test() { |
| 133 |
+ if [[ ${EPYTHON} == python3.9 ]]; then |
| 134 |
+ einfo "Skipping py3.9 due to unported deps" |
| 135 |
+ return |
| 136 |
+ fi |
| 137 |
+ |
| 138 |
distutils_install_for_testing |
| 139 |
|
| 140 |
"${EPYTHON}" -m pytest -vv --lsof -rfsxX \ |
Archives