Merge branch 'master' into release-2.1
This commit is contained in:
commit
2fb7885c56
@ -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
|
||||
|
||||
4
tox.ini
4
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user