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/sphinx/
Date: Tue, 03 Mar 2020 17:46:08
Message-Id: 1583257559.2cd75b5f120be4157309239ec3255da6df4e3239.mgorny@gentoo
1 commit: 2cd75b5f120be4157309239ec3255da6df4e3239
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 3 17:20:05 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 3 17:45:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd75b5f
7
8 dev-python/sphinx: Use typed-ast on py<3.8
9
10 dev-python/typed-ast is necessary for better typing support in py<3.8.
11 This also fixes (hopefully last) test failures.
12
13 Closes: https://bugs.gentoo.org/703140
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 dev-python/sphinx/{sphinx-2.4.3.ebuild => sphinx-2.4.3-r1.ebuild} | 6 +++++-
17 1 file changed, 5 insertions(+), 1 deletion(-)
18
19 diff --git a/dev-python/sphinx/sphinx-2.4.3.ebuild b/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
20 similarity index 95%
21 rename from dev-python/sphinx/sphinx-2.4.3.ebuild
22 rename to dev-python/sphinx/sphinx-2.4.3-r1.ebuild
23 index 46f34931a94..8063e705318 100644
24 --- a/dev-python/sphinx/sphinx-2.4.3.ebuild
25 +++ b/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
26 @@ -37,6 +37,9 @@ RDEPEND="
27 dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
28 dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
29 dev-python/packaging[${PYTHON_USEDEP}]
30 + $(python_gen_cond_dep '
31 + dev-python/typed-ast[${PYTHON_USEDEP}]
32 + ' python3_{6,7})
33 latex? (
34 dev-texlive/texlive-latexextra
35 dev-texlive/texlive-luatex
36 @@ -64,7 +67,8 @@ python_prepare_all() {
37 rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
38 sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
39
40 - # fail under pypy3
41 + # fail under pypy3 (some because of missing typed-ast)
42 + # revisit when pypy3 becomes pypy3.8
43 sed -i -e '/def test_partialfunction/i\
44 @pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
45 -e '/def test_autodoc_typed_instance_variables/i\