Bump Sphinx minimal dependencies to latest

Also splits out docs requirements to docs-requirements.txt to avoid
coala failing to run because of version conflict with Sphinx version we
want to use for docs.

Change-Id: I64d0b5953be03f91bf67e75e54072d1da9df5d1a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/docs-requirements.txt b/docs-requirements.txt
new file mode 100644 (file)
index 0000000..48dadae
--- /dev/null
+++ b/docs-requirements.txt
@@ -0,0 +1,5 @@
+-r requirements.txt
+sphinx>=1.6.4
+sphinxcontrib-programoutput
+sphinx_bootstrap_theme>=0.6.0
+

diff --git a/requirements.txt b/requirements.txt
index c5cfb52..98cc84a 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,9 +3,6 @@ pyyaml
 requests!=2.13.0
 setuptools>=36.5.0
 shade
-sphinx>=1.4.9
-sphinxcontrib-programoutput
-sphinx_bootstrap_theme>=0.4.14
 python-jenkins
 
 # workarounds to prevent upstream from breaking us

diff --git a/tox.ini b/tox.ini
index f291b19..d2303c1 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -29,14 +29,14 @@ commands =
     coala --non-interactive
 
 [testenv:docs]
-deps = -rrequirements.txt
+deps = -rdocs-requirements.txt
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
 whitelist_externals = echo
 
 [testenv:docs-linkcheck]
-deps = -rrequirements.txt
+deps = -rdocs-requirements.txt
 commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
 
 [testenv:license]