andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into release-2.1

Browse Source
This commit is contained in:
Stein Magnus Jodal 2018-09-19 22:25:58 +02:00
commit 2fb7885c56
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/requirements.txt
View File

@ -1,4 +1,4 @@
Sphinx >= 1.0 Sphinx >= 1.0, != 1.8.0
pygraphviz pygraphviz
Pykka >= 1.1 Pykka >= 1.1
# Require newer requests than what Travis/Debian has to work around linkcheck crash # Require newer requests than what Travis/Debian has to work around linkcheck crash

4
tox.ini
View File

@ -26,7 +26,7 @@ deps =
[testenv:docs] [testenv:docs]
deps = -r{toxinidir}/docs/requirements.txt deps = -r{toxinidir}/docs/requirements.txt
changedir = docs 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] [testenv:flake8]
deps = deps =
@ -38,4 +38,4 @@ commands = flake8 --show-source --statistics mopidy tests
[testenv:linkcheck] [testenv:linkcheck]
deps = -r{toxinidir}/docs/requirements.txt deps = -r{toxinidir}/docs/requirements.txt
changedir = docs changedir = docs
commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees . {envtmpdir}/html commands = python -m sphinx -b linkcheck -d {envtmpdir}/doctrees . {envtmpdir}/html