summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2020-05-15 21:57:09 +0200
committerAndreas Jaeger <jaegerandi@gmail.com>2020-05-21 13:43:00 +0000
commita9e9de2f210df9eda2e0e8dfd8d5c75e1ede4212 (patch)
tree4d5b1484b2e0280764d5e1e788cb31cf32dfa48e /doc
parent825f026448df3b3c22521dbda08cb8b5f8f5b423 (diff)
downloadkeystonemiddleware-a9e9de2f210df9eda2e0e8dfd8d5c75e1ede4212.tar.gz
Switch to newer openstackdocstheme and reno versions
Switch to openstackdocstheme 2.2.1 and reno 3.1.0 versions. Using these versions will allow especially: * Linking from HTML to PDF document * parallelizing building of documents Update Sphinx version as well. Remove the doc requirements from lower-constraints, they are not needed during installation. openstackdocstheme renames some variables, so follow the renames. A couple of variables are also not needed anymore, remove them. Set openstackdocs_pdf_link to link to PDF file. Change pygments_style to 'native' since old theme version always used 'native' and the theme now respects the setting and using 'sphinx' can lead to some strange rendering. See also http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014971.html Change-Id: Ic7c901ff19aa073b6e003ccb95aaf77886f20152
Diffstat (limited to 'doc')
-rw-r--r--doc/requirements.txt6
-rw-r--r--doc/source/conf.py9
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index f89d55a..4f27cc1 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,9 +4,9 @@
# For generating sphinx documentation
doc8>=0.6.0 # Apache-2.0
-openstackdocstheme>=1.20.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
sphinxcontrib-apidoc>=0.2.0 # BSD
# PDF Docs
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4428242..4c39b3a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -107,7 +107,7 @@ add_module_names = True
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# A list of ignored prefixes for module index sorting.
modindex_common_prefix = ['keystonemiddleware.']
@@ -242,6 +242,7 @@ intersphinx_mapping = {'keystoneclient': (keystoneclient, None),
}
# -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/keystonemiddleware'
-bug_project = 'keystonemiddleware'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/keystonemiddleware'
+openstackdocs_bug_project = 'keystonemiddleware'
+openstackdocs_bug_tag = ''
+openstackdocs_pdf_link = True