From 2a45fe74f9598b4e726ab17ce17948d4e709894b Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 22 Sep 2018 11:54:03 +0200
Subject: [PATCH] Merge pull request #3364 from stevepiercy/1.9-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 24179e5..4f9fb96 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -165,6 +165,15 @@
outdated='false',
)
+# 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
@@ -316,7 +325,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 6a3c8d2..8a31d90 100644
--- a/setup.py
+++ b/setup.py
@@ -46,11 +46,11 @@
docs_extras = [
- 'Sphinx >= 1.7.4',
+ '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