Merge "Move sphinx + deps to doc/requirements.txt"

2018-09-03 12:22:02 +00:00 · 2018-09-03 12:22:02 +00:00 · a9daee98fc
commit a9daee98fc
parent ef6be899b6 fe6b7ddfca
3 changed files with 6 additions and 4 deletions
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@ -0,0 +1,4 @@
+sphinx>=1.5.1,<1.6
+sphinxcontrib-programoutput
+sphinxcontrib-httpdomain
+reno>=2.5.0 # Apache-2.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -1,10 +1,6 @@
 # Nodepool uses hacking for its dependencies
 hacking>=0.10.2,<0.11
 coverage
-sphinx>=1.5.1,<1.6
-sphinxcontrib-programoutput
-sphinxcontrib-httpdomain
-reno>=2.5.0 # Apache-2.0
 fixtures>=0.3.12
 mock>=1.0
 python-subunit
--- a/tox.ini
+++ b/tox.ini
@ -45,6 +45,8 @@ commands =

 [testenv:docs]
 basepython = python3
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/doc/requirements.txt
 commands =
  sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html