diff options
| author | Rémy Léone <remy.leone@gmail.com> | 2017-03-20 16:37:49 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-31 09:19:37 -0600 |
| commit | c46988aef2de6d290b7c5453d58f1293337aefaa (patch) | |
| tree | e525b9e8fbc204333b11a11244e448a55d103c07 | |
| parent | 036db11cab275dd3cc13284e760bb050c59559be (diff) | |
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>
| -rw-r--r-- | Documentation/conf.py | 4 | ||||
| -rw-r--r-- | Documentation/sphinx/cdomain.py | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/Documentation/sphinx/cdomain.py b/Documentation/sphinx/cdomain.py index df0419c62096..cf13ff3a656c 100644 --- a/Documentation/sphinx/cdomain.py +++ b/Documentation/sphinx/cdomain.py @@ -44,7 +44,7 @@ from sphinx.domains.c import CDomain as Base_CDomain __version__ = '1.0' # Get Sphinx version -major, minor, patch = map(int, sphinx.__version__.split(".")) +major, minor, patch = sphinx.version_info[:3] def setup(app): |