Merge "Update theme for docs"

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

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