summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/source/conf.py6
-rw-r--r--test-requirements.txt1
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3647e09..6c9148e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -21,7 +21,8 @@
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.doctest',
- 'sphinx.ext.coverage'
+ 'sphinx.ext.coverage',
+ 'oslosphinx'
]
templates_path = ['_templates']
@@ -31,14 +32,13 @@ source_suffix = '.rst'
master_doc = 'index'
project = u'python-troveclient'
-copyright = u'2012, OpenStack Foundation'
+copyright = u'2014, OpenStack Foundation'
exclude_trees = []
pygments_style = 'sphinx'
html_theme = 'default'
-html_static_path = ['_static']
htmlhelp_basename = 'python-troveclientdoc'
latex_documents = [
('index', 'python-troveclient.tex', u'python-troveclient Documentation',
diff --git a/test-requirements.txt b/test-requirements.txt
index 0e19817..e26eae3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,6 @@
hacking>=0.8.0,<0.9
discover
+oslosphinx>=2.2.0
sphinx>=1.1.2,!=1.2.0,<1.3
testrepository>=0.0.18
testtools>=0.9.34