Merge "Start using oslosphinx theme for docs"

doc/source/conf.py

@@ -28,10 +28,9 @@ import os
 # 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.viewcode',
-]
+extensions = ['sphinx.ext.autodoc',
+              'sphinx.ext.viewcode',
+              'oslosphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

test-requirements.txt

@@ -3,9 +3,9 @@ hacking>=0.10.2,<0.11
 coverage>=3.6
 discover
 mock>=1.2
-oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0
 pylint==1.4.5 # GNU GPL v2
 python-subunit>=0.0.18
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD
+oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0
 testrepository>=0.0.18
 testtools>=1.4.0