Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-functools/
Date: Mon, 25 Nov 2019 12:35:38
Message-Id: 1574685310.81118dadce2dbf775d7637b6360fde875f059830.mgorny@gentoo
1 commit: 81118dadce2dbf775d7637b6360fde875f059830
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 25 12:25:03 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 25 12:35:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81118dad
7
8 dev-python/jaraco-functools: Use distutils_enable_sphinx
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 .../jaraco-functools-2.0-r1.ebuild | 33 ++++------------------
13 1 file changed, 6 insertions(+), 27 deletions(-)
14
15 diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
16 index 348372445e0..b90ba6298d7 100644
17 --- a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
18 +++ b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
19 @@ -11,11 +11,13 @@ MY_PN="${PN/-/.}"
20 DESCRIPTION="Additional functions used by other projects by developer jaraco"
21 HOMEPAGE="https://github.com/jaraco/jaraco.functools"
22 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
23 +S="${WORKDIR}/${MY_PN}-${PV}"
24
25 LICENSE="MIT"
26 SLOT="0"
27 KEYWORDS="~amd64 ~arm64 ~x86"
28 -IUSE="doc test"
29 +IUSE="test"
30 +RESTRICT="!test? ( test )"
31
32 RDEPEND="
33 >=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
34 @@ -23,13 +25,6 @@ RDEPEND="
35 $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
36 "
37 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
38 - doc? (
39 - $(python_gen_any_dep '
40 - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
41 - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
42 - dev-python/sphinx[${PYTHON_USEDEP}]'
43 - )
44 - )
45 test? (
46 ${RDEPEND}
47 >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
48 @@ -39,19 +34,11 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
49 )
50 "
51
52 -RESTRICT="!test? ( test )"
53 -
54 -S="${WORKDIR}/${MY_PN}-${PV}"
55 -
56 PATCHES=( "${FILESDIR}/${P}-fix-py37-tests.patch" )
57
58 -python_check_deps() {
59 - use doc || return 0
60 -
61 - has_version ">=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]" && \
62 - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \
63 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
64 -}
65 +distutils_enable_sphinx docs \
66 + ">=dev-python/jaraco-packaging-3.2" \
67 + ">=dev-python/rst-linker-1.9"
68
69 python_prepare_all() {
70 # avoid a setuptools_scm dependency
71 @@ -62,14 +49,6 @@ python_prepare_all() {
72 distutils-r1_python_prepare_all
73 }
74
75 -python_compile_all() {
76 - if use doc; then
77 - cd docs || die
78 - sphinx-build . _build/html || die
79 - HTML_DOCS=( docs/_build/html/. )
80 - fi
81 -}
82 -
83 python_test() {
84 # Override pytest options to skip flake8
85 PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \