Revert "Switch from oslosphinx to openstackdocstheme"

openstackdocstheme is only for Official OpenStack projects, see
https://docs.openstack.org/openstackdocstheme/latest/

this repo is not an official project under governance.

This reverts commit 66d45fc53d.

Fix build problems:
* Fix wrong include path
* Disable sphinxmark

Change-Id: I83e91d12e82a8cf703f4b09c7d315edbb9878bd9
This commit is contained in:
Andreas Jaeger 2017-07-02 07:32:22 +00:00 committed by Andreas Jaeger
parent 66d45fc53d
commit 7aa600e42f
4 changed files with 9 additions and 22 deletions

View File

@ -45,8 +45,9 @@ import pbr.version
# ones.
extensions = [
'sphinx.ext.autodoc',
'openstackdocstheme',
'sphinxmark'
'oslosphinx',
# Disabled, does not build
# 'sphinxmark'
]
# Add any paths that contain templates here, relative to this directory.
@ -121,22 +122,13 @@ todo_include_todos = False
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'openstackdocs'
html_theme = 'default'
# 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
# documentation.
html_theme_options = {
"display_toc": False
}
# Add any paths that contain custom themes here, relative to this directory.
# html_theme_path = ["."]
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
# html_last_updated_fmt = '%b %d, %Y'
html_last_updated_fmt = '%Y-%m-%d %H:%M'
# -- Options for HTMLHelp output ------------------------------------------

View File

@ -23,9 +23,9 @@ Testing plugins
---------------
Add tests in the ``tests`` directory and follow the ``uptime`` example. Here
are the contents of ``tests/test_plugin_uptime.py`` as an example:
are the contents of ``tests/int/test_plugin_uptime.py`` as an example:
.. literalinclude:: ../../tests/test_plugin_uptime.py
.. literalinclude:: ../../tests/int/test_plugin_uptime.py
Running tests
-------------

View File

@ -44,7 +44,7 @@ import pbr.version
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'openstackdocstheme',
'oslosphinx',
'reno.sphinxext',
]
@ -120,7 +120,7 @@ todo_include_todos = False
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'openstackdocs'
html_theme = 'default'
# 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
@ -129,11 +129,6 @@ html_theme = 'openstackdocs'
# html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
# html_theme_path = []
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
html_last_updated_fmt = '%Y-%m-%d %H:%M'
# -- Options for HTMLHelp output ------------------------------------------

View File

@ -9,7 +9,7 @@ mock>=2.0 # BSD
# this is required for the docs build jobs
sphinx>=1.6.2 # BSD
openstackdocstheme>=1.5.0 # Apache-2.0
oslosphinx>=4.7.0 # Apache-2.0
doc8 # Apache-2.0
reno>=1.8.0 # Apache-2.0
sphinxmark>=0.1.14 # Apache-2.0