summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/requirements.txt5
-rwxr-xr-xdoc/source/conf.py14
2 files changed, 7 insertions, 12 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 827758f..b46abf3 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,6 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+openstackdocstheme>=1.20.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c67ccb7..b056e5c 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,7 +37,6 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = u'python-barbicanclient'
copyright = u'2014, OpenStack Foundation'
# If true, '()' will be appended to :func: etc. cross-reference text.
@@ -61,20 +60,15 @@ html_theme_options = {}
html_theme = 'openstackdocs'
# Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+htmlhelp_basename = 'python-barbicanclientdoc'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass
# [howto/manual]).
latex_documents = [
('index',
- '%s.tex' % project,
- u'%s Documentation' % project,
+ 'python-barbicanclient.tex',
+ u'python-barbicanclient Documentation',
u'OpenStack Foundation', 'manual'),
]
@@ -84,4 +78,4 @@ latex_documents = [
# -- Options for openstackdocstheme -------------------------------------------
repository_name = 'openstack/python-barbicanclient'
bug_project = 'python-barbicanclient'
-bug_tag = '' \ No newline at end of file
+bug_tag = ''