leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use sphinx.version_info directly instead of parsing

Browse Source 
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>
This commit is contained in:
Rémy Léone
2017-03-20 16:37:49 +01:00
committed by Jonathan Corbet
parent 036db11cab
commit c46988aef2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/conf.py
View File

@@ -17,7 +17,7 @@ import os
import sphinx import sphinx
# Get Sphinx version # 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, # If extensions (or modules to document with autodoc) are in another directory,
@@ -29,7 +29,7 @@ from load_config import loadConfig
# -- General configuration ------------------------------------------------ # -- General configuration ------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here. # 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 # Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

2
Documentation/sphinx/cdomain.py
View File

@@ -44,7 +44,7 @@ from sphinx.domains.c import CDomain as Base_CDomain
__version__ = '1.0' __version__ = '1.0'
# Get Sphinx version # Get Sphinx version
major, minor, patch = map(int, sphinx.__version__.split(".")) major, minor, patch = sphinx.version_info[:3]
def setup(app): def setup(app):