summaryrefslogtreecommitdiffstats
path: root/Documentation/conf.py
diff options
context:
space:
mode:
authorRémy Léone <remy.leone@gmail.com>2017-03-20 16:37:49 +0100
committerJonathan Corbet <corbet@lwn.net>2017-03-31 09:19:37 -0600
commitc46988aef2de6d290b7c5453d58f1293337aefaa (patch)
treee525b9e8fbc204333b11a11244e448a55d103c07 /Documentation/conf.py
parent036db11cab275dd3cc13284e760bb050c59559be (diff)
downloadlinux-c46988aef2de6d290b7c5453d58f1293337aefaa.tar.gz
linux-c46988aef2de6d290b7c5453d58f1293337aefaa.tar.bz2
linux-c46988aef2de6d290b7c5453d58f1293337aefaa.zip
Use sphinx.version_info directly instead of parsing
Using the development version of sphinx caused the parsing of the version to fail. Signed-off-by: Rémy Léone <remy.leone@gmail.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/conf.py')
-rw-r--r--Documentation/conf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index f2b916158377..08aef4595059 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -17,7 +17,7 @@ import os
import sphinx
# Get Sphinx version
-major, minor, patch = map(int, sphinx.__version__.split("."))
+major, minor, patch = sphinx.version_info[:3]
# If extensions (or modules to document with autodoc) are in another directory,
@@ -29,7 +29,7 @@ from load_config import loadConfig
# -- General configuration ------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.2'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom