Merge "Use doc/requirements.txt"

2018-10-29 07:11:37 +00:00 · 2018-10-29 07:11:37 +00:00 · 5f7f7eaf40
commit 5f7f7eaf40
parent d9059524e0 cb9e1b4885
3 changed files with 8 additions and 6 deletions
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@ -0,0 +1,6 @@
+sphinx>=1.6.1
+sphinxcontrib-blockdiag>=1.1.0
+sphinxcontrib-programoutput
+sphinx-autodoc-typehints
+reno>=2.8.0 # Apache-2.0
+zuul-sphinx
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -1,16 +1,10 @@
 flake8

 coverage>=3.6
-sphinx>=1.6.1
-sphinxcontrib-blockdiag>=1.1.0
 fixtures>=0.3.14
 stestr>=1.0.0 # Apache-2.0
 testtools>=0.9.32
-sphinxcontrib-programoutput
-sphinx-autodoc-typehints
-reno>=2.8.0 # Apache-2.0
 PyMySQL
 psycopg2-binary
 mypy
-zuul-sphinx
 beautifulsoup4
--- a/tox.ini
+++ b/tox.ini
@ -64,6 +64,8 @@ commands =
    coverage xml -o cover/coverage.xml

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