Commit c46988ae authored Mar 20, 2017 by Rémy Léone Committed by Jonathan Corbet Mar 31, 2017

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>

parent 036db11c

Documentation/conf.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

Documentation/sphinx/cdomain.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -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):