From 0efbe981f53537c2056f42b6099aa98d5727b985 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 19 Sep 2018 21:33:43 +0200 Subject: [PATCH 1/2] tox: Ensure Sphinx from within tox env is used --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 6b4a05ed..1bb20cbb 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ deps = [testenv:docs] deps = -r{toxinidir}/docs/requirements.txt changedir = docs -commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html +commands = python -m sphinx -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:flake8] deps = @@ -38,4 +38,4 @@ commands = flake8 --show-source --statistics mopidy tests [testenv:linkcheck] deps = -r{toxinidir}/docs/requirements.txt changedir = docs -commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees . {envtmpdir}/html +commands = python -m sphinx -b linkcheck -d {envtmpdir}/doctrees . {envtmpdir}/html From faea0c638cf67b2c127591800c1db614247324d3 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 19 Sep 2018 21:37:14 +0200 Subject: [PATCH 2/2] docs: Avoid Sphinx 1.8.0, which fails on Python 2.7 See https://github.com/sphinx-doc/sphinx/issues/5417 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index ddc1d265..aa07bff4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ -Sphinx >= 1.0 +Sphinx >= 1.0, != 1.8.0 pygraphviz Pykka >= 1.1 # Require newer requests than what Travis/Debian has to work around linkcheck crash