Use doc/requirements and openstackdocstheme

oslosphinx is the old hotness. openstackdocstheme is the new hotness.
Also, we can use doc/requirements.txt for docs requirements.

Change-Id: I9cbc670c8fb065d240251f061919479c87193ff5
This commit is contained in:
Monty Taylor 2018-08-21 08:57:12 -05:00 committed by Clark Boylan
parent c9282ae021
commit 8236cdbf37
4 changed files with 7 additions and 4 deletions

2
doc/requirements.txt Normal file
View File

@ -0,0 +1,2 @@
sphinx!=1.6.6,!=1.6.7 # BSD
openstackdocstheme>=1.11.0 # Apache-2.0

View File

@ -30,7 +30,7 @@ import os
# ones. # ones.
extensions = [ extensions = [
'sphinx.ext.autodoc', 'sphinx.ext.autodoc',
'oslosphinx', 'openstackdocstheme',
] ]
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
@ -92,7 +92,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for # The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes. # a list of builtin themes.
html_theme = 'default' html_theme = 'openstackdocs'
# Theme options are theme-specific and customize the look and feel of a theme # Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the # further. For a list of options available for each theme, see the

View File

@ -3,5 +3,3 @@ mock
fixtures>=0.3.14 fixtures>=0.3.14
testrepository>=0.0.18 testrepository>=0.0.18
testtools>=0.9.34 testtools>=0.9.34
oslosphinx
sphinx>=1.1.2,!=1.2.0,<1.3

View File

@ -22,6 +22,9 @@ commands = flake8
commands = python setup.py sdist {posargs} commands = python setup.py sdist {posargs}
[testenv:docs] [testenv:docs]
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = commands =
sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html