From c4523b14623f30d73e43be71d7bbd0b92e10a5ee Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Sat, 14 Oct 2017 11:06:57 -0400 Subject: [PATCH] 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 --- docs-requirements.txt | 5 +++++ requirements.txt | 3 --- tox.ini | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 docs-requirements.txt diff --git a/docs-requirements.txt b/docs-requirements.txt new file mode 100644 index 00000000..48dadae4 --- /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 c5cfb526..98cc84aa 100644 --- 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 f291b193..d2303c14 100644 --- 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] -- 2.16.6