Merge "Revert use of olsosphinx library"

doc/source/conf.py

@@ -21,9 +21,9 @@ sys.path.insert(0, os.path.abspath('../..'))
 # 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.autodoc'
     #'sphinx.ext.intersphinx',
-    'oslo.sphinx'
+    #'oslo.sphinx'
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -55,7 +55,7 @@ pygments_style = 'sphinx'
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
-# html_theme = '_theme'
+html_theme = 'default'
 # html_static_path = ['static']
 
 # Output file base name for HTML help builder.
@@ -72,4 +72,4 @@ latex_documents = [
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.
-#intersphinx_mapping = {'http://docs.python.org/': None}
+#intersphinx_mapping = {'http://docs.python.org/': None}

test-requirements.txt

@@ -1,11 +1,9 @@
 hacking>=0.5.6,<0.8
-
 coverage>=3.6
 discover
 fixtures>=0.3.14
 python-subunit
 sphinx>=1.1.2
-oslo.sphinx
 testrepository>=0.0.17
 testscenarios>=0.4,<0.5
-testtools>=0.9.32
+testtools>=0.9.32