diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-04 08:10:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-04 08:10:00 +0000 |
| commit | d77b6f8287bb6762d168d1f0fef706b877d0e863 (patch) | |
| tree | f54c8d062d2a2b7e192233723c58646bf76c1aa9 | |
| parent | c9e7818f3f90ce761ad8ccd09181c705880a4266 (diff) | |
| parent | 34adf358ca290c088c62fa4e0890db727ac2558a (diff) | |
| download | python-cinderclient-d77b6f8287bb6762d168d1f0fef706b877d0e863.tar.gz | |
Merge "Update theme for docs"
| -rw-r--r-- | doc/source/conf.py | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index d4ae7ca..ff74d86 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -28,7 +28,7 @@ sys.path.insert(0, ROOT) # Add any Sphinx extension module names here, as strings. They can be # extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'oslosphinx'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -102,7 +102,7 @@ man_pages = [ # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. -html_theme = 'nature' +#html_theme = 'nature' # 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 diff --git a/test-requirements.txt b/test-requirements.txt index afd5af7..0c2aa1c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,6 +5,7 @@ discover fixtures>=0.3.14 mock>=1.0 httpretty>=0.8.0,!=0.8.1,!=0.8.2 +oslosphinx python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,<1.3 testtools>=0.9.34 |