1 |
commit: 9b44e5a66ec5f29c30962600ebf8b4bec6fd05e4 |
2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 9 16:22:00 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 9 17:28:53 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b44e5a6 |
7 |
|
8 |
dev-python/PyUtilib: enable py3.10, add missing deps |
9 |
|
10 |
Needed to fix a very small and irrelevant part of tests, which check |
11 |
exact output of --help output. In python 3.10 it changed the texts, |
12 |
so those fails are failing now. Fix by using sed and change only for |
13 |
python 3.10 the expected output. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/812269 |
16 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
17 |
|
18 |
dev-python/PyUtilib/PyUtilib-6.0.0.ebuild | 13 +++++++++++-- |
19 |
1 file changed, 11 insertions(+), 2 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild |
22 |
index d0f3e6c3885..fe1c027f23d 100644 |
23 |
--- a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild |
24 |
+++ b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild |
25 |
@@ -3,8 +3,7 @@ |
26 |
|
27 |
EAPI=7 |
28 |
|
29 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
30 |
-PYTHON_COMPAT=( python3_{7..9} ) |
31 |
+PYTHON_COMPAT=( python3_{8..10} ) |
32 |
DISTUTILS_IN_SOURCE_BUILD=1 |
33 |
|
34 |
inherit distutils-r1 |
35 |
@@ -18,6 +17,9 @@ LICENSE="BSD" |
36 |
SLOT="0" |
37 |
KEYWORDS="~amd64 ~x86" |
38 |
|
39 |
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]" |
40 |
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
41 |
+ |
42 |
PATCHES=( |
43 |
"${FILESDIR}/PyUtilib-6.0.0-tests.patch" |
44 |
) |
45 |
@@ -36,5 +38,12 @@ python_test() { |
46 |
local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \ |
47 |
COLUMNS=80 |
48 |
|
49 |
+ if [[ ${EPYTHON} == python3.10 ]]; then |
50 |
+ # Fix for very small output change of expected output in new version |
51 |
+ sed -e 's/optional arguments/options/' -i \ |
52 |
+ "${BUILD_DIR}/../doc/workflow/examples/"*.txt \ |
53 |
+ pyutilib/misc/tests/test_config.py || die |
54 |
+ fi |
55 |
+ |
56 |
eunittest |
57 |
} |