Drop oslosphinx and use openstackdocstheme

OpenStack moved to openstackdocstheme so use it here instead of
oslosphinx.
Also update the used Sphinx version. This is now in sync with the
versions from requirements/global-requirements.txt .

Change-Id: I0ffbea9b83abe9d9ae3886e7a427fc01637b36ea
This commit is contained in:
Thomas Bechtold 2019-09-24 09:49:41 +02:00
parent ce77eba479
commit e379747cd8
3 changed files with 10 additions and 4 deletions

View File

@ -23,7 +23,7 @@ sys.path.insert(0, os.path.abspath('../..'))
extensions = [ extensions = [
'sphinx.ext.autodoc', 'sphinx.ext.autodoc',
#'sphinx.ext.intersphinx', #'sphinx.ext.intersphinx',
'oslosphinx' 'openstackdocstheme'
] ]
# autodoc generation is a bit aggressive and a nuisance when doing heavy # autodoc generation is a bit aggressive and a nuisance when doing heavy
@ -58,6 +58,8 @@ pygments_style = 'sphinx'
# html_theme = '_theme' # html_theme = '_theme'
# html_static_path = ['static'] # html_static_path = ['static']
html_theme = 'openstackdocs'
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = '%sdoc' % project htmlhelp_basename = '%sdoc' % project
@ -73,3 +75,7 @@ latex_documents = [
# Example configuration for intersphinx: refer to the Python standard library. # Example configuration for intersphinx: refer to the Python standard library.
#intersphinx_mapping = {'http://docs.python.org/': None} #intersphinx_mapping = {'http://docs.python.org/': None}
# openstackdocstheme options
repository_name = 'openstack/ceilometermiddleware'
bug_project = 'http://bugs.launchpad.net/ceilometermiddleware'

View File

@ -4,8 +4,8 @@
coverage>=3.6 # Apache-2.0 coverage>=3.6 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD
openstackdocstheme>=1.17.0 # Apache-2.0 openstackdocstheme>=1.17.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0

View File

@ -34,7 +34,7 @@ commands =
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
commands = python setup.py build_sphinx commands = sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
[testenv:debug] [testenv:debug]
basepython = python3 basepython = python3