Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rémy Léone and committed by
Jonathan Corbet
c46988ae 036db11c

+3 -3
+2 -2
Documentation/conf.py
··· 17 17 import sphinx 18 18 19 19 # Get Sphinx version 20 - major, minor, patch = map(int, sphinx.__version__.split(".")) 20 + major, minor, patch = sphinx.version_info[:3] 21 21 22 22 23 23 # If extensions (or modules to document with autodoc) are in another directory, ··· 29 29 # -- General configuration ------------------------------------------------ 30 30 31 31 # If your documentation needs a minimal Sphinx version, state it here. 32 - #needs_sphinx = '1.0' 32 + needs_sphinx = '1.2' 33 33 34 34 # Add any Sphinx extension module names here, as strings. They can be 35 35 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+1 -1
Documentation/sphinx/cdomain.py
··· 44 44 __version__ = '1.0' 45 45 46 46 # Get Sphinx version 47 - major, minor, patch = map(int, sphinx.__version__.split(".")) 47 + major, minor, patch = sphinx.version_info[:3] 48 48 49 49 def setup(app): 50 50