Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2018-11-26 12:55:05 -02:00
parent 7d3ca68be6 d8e00c983e
commit b73e083d9d
27 changed files with 370 additions and 168 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -124,10 +124,7 @@ setenv = {[testenv:py27-pluggymaster]setenv}
 skipsdist = True
 usedevelop = True
 changedir = doc/en
-deps =
-    PyYAML
-    sphinx
-    sphinxcontrib-trio
+deps = -r{toxinidir}/doc/en/requirements.txt

 commands =
    sphinx-build -W -b html . _build