1 |
commit: a3b64e48f23f18b88db54a99e2084470b9703fb1 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 16 09:53:18 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 16 11:01:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b64e48 |
7 |
|
8 |
dev-python/more-itertools: Enable py3.8, modernize |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../more-itertools/more-itertools-5.0.0.ebuild | 26 +++++++++++++--------- |
13 |
.../more-itertools/more-itertools-7.0.0.ebuild | 23 +++++++++++-------- |
14 |
2 files changed, 29 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild |
17 |
index 76d7ff3d2c9..f1084c6e2e4 100644 |
18 |
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild |
19 |
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild |
20 |
@@ -3,7 +3,7 @@ |
21 |
|
22 |
EAPI=7 |
23 |
|
24 |
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} ) |
25 |
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} ) |
26 |
|
27 |
inherit distutils-r1 |
28 |
|
29 |
@@ -14,26 +14,30 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
30 |
LICENSE="MIT" |
31 |
SLOT="0" |
32 |
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
33 |
-IUSE="doc test" |
34 |
-RESTRICT="!test? ( test )" |
35 |
+IUSE="doc" |
36 |
|
37 |
RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]" |
38 |
-DEPEND=" |
39 |
+BDEPEND=" |
40 |
dev-python/setuptools[${PYTHON_USEDEP}] |
41 |
doc? ( |
42 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
43 |
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
44 |
+ $(python_gen_any_dep ' |
45 |
+ dev-python/sphinx[${PYTHON_USEDEP}] |
46 |
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
47 |
+ ' python3_{5,6,7} pypy{,3}) |
48 |
) |
49 |
- test? ( ${RDEPEND} ) |
50 |
" |
51 |
|
52 |
+distutils_enable_tests unittest |
53 |
+ |
54 |
+python_check_deps() { |
55 |
+ use doc || return 0 |
56 |
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && |
57 |
+ has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" |
58 |
+} |
59 |
+ |
60 |
python_compile_all() { |
61 |
if use doc; then |
62 |
sphinx-build docs docs/_build/html || die |
63 |
HTML_DOCS=( docs/_build/html/. ) |
64 |
fi |
65 |
} |
66 |
- |
67 |
-python_test() { |
68 |
- "${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}" |
69 |
-} |
70 |
|
71 |
diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild |
72 |
index 9671e3461b2..b68c576d0f8 100644 |
73 |
--- a/dev-python/more-itertools/more-itertools-7.0.0.ebuild |
74 |
+++ b/dev-python/more-itertools/more-itertools-7.0.0.ebuild |
75 |
@@ -3,7 +3,7 @@ |
76 |
|
77 |
EAPI=7 |
78 |
|
79 |
-PYTHON_COMPAT=( python3_{5,6,7} pypy{,3} ) |
80 |
+PYTHON_COMPAT=( python3_{5,6,7,8} pypy{,3} ) |
81 |
|
82 |
inherit distutils-r1 |
83 |
|
84 |
@@ -16,22 +16,27 @@ SLOT="0" |
85 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
86 |
IUSE="doc" |
87 |
|
88 |
-RDEPEND="" |
89 |
-DEPEND=" |
90 |
+BDEPEND=" |
91 |
dev-python/setuptools[${PYTHON_USEDEP}] |
92 |
doc? ( |
93 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
94 |
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
95 |
+ $(python_gen_any_dep ' |
96 |
+ dev-python/sphinx[${PYTHON_USEDEP}] |
97 |
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
98 |
+ ' python3_{5,6,7} pypy{,3}) |
99 |
) |
100 |
" |
101 |
|
102 |
+distutils_enable_tests unittest |
103 |
+ |
104 |
+python_check_deps() { |
105 |
+ use doc || return 0 |
106 |
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && |
107 |
+ has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" |
108 |
+} |
109 |
+ |
110 |
python_compile_all() { |
111 |
if use doc; then |
112 |
sphinx-build docs docs/_build/html || die |
113 |
HTML_DOCS=( docs/_build/html/. ) |
114 |
fi |
115 |
} |
116 |
- |
117 |
-python_test() { |
118 |
- "${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}" |
119 |
-} |