From e22970cd21eb36c2a658c843bb5cb4f59d77fd19 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 22 Sep 2018 11:49:16 +0200
Subject: [PATCH] Merge pull request #3365 from stevepiercy/1.8-branch
---
docs/conf.py | 10 +++++++++-
setup.py | 4 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index ef93a61..0b3fb65 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -163,6 +163,15 @@
outdated='true',
)
+# Control display of sidebars
+html_sidebars = {'**': [
+ 'localtoc.html',
+ 'ethicalads.html',
+ 'relations.html',
+ 'sourcelink.html',
+ 'searchbox.html',
+]}
+
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
html_title = 'The Pyramid Web Framework v%s' % release
@@ -314,7 +323,6 @@
latex_elements = {
'preamble': _PREAMBLE,
- 'wrapperclass': 'book',
'date': '',
'releasename': 'Version',
'title': r'The Pyramid Web Framework',
diff --git a/setup.py b/setup.py
index 06210ce..de4d578 100644
--- a/setup.py
+++ b/setup.py
@@ -56,11 +56,11 @@
docs_extras = [
- 'Sphinx >= 1.3.5, != 1.7.3',
+ 'Sphinx >= 1.8.1',
'docutils',
'repoze.sphinx.autointerface',
'pylons_sphinx_latesturl',
- 'pylons-sphinx-themes',
+ 'pylons-sphinx-themes >= 1.0.8',
'sphinxcontrib-autoprogram',
]
--
Gitblit v1.9.3