Browse Source

Bumped minimum Sphinx version to 1.6.0.

Tim Graham 7 years ago
parent
commit
de0e54ea00
2 changed files with 2 additions and 6 deletions
  1. 1 5
      docs/_ext/djangodocs.py
  2. 1 1
      docs/conf.py

+ 1 - 5
docs/_ext/djangodocs.py

@@ -14,11 +14,7 @@ from sphinx.directives import CodeBlock
 from sphinx.domains.std import Cmdoption
 from sphinx.util.console import bold
 from sphinx.util.nodes import set_source_info
-
-try:
-    from sphinx.writers.html import SmartyPantsHTMLTranslator as HTMLTranslator
-except ImportError:  # Sphinx 1.6+
-    from sphinx.writers.html import HTMLTranslator
+from sphinx.writers.html import HTMLTranslator
 
 # RE for option descriptions without a '--' prefix
 simple_option_desc_re = re.compile(

+ 1 - 1
docs/conf.py

@@ -32,7 +32,7 @@ sys.path.append(abspath(join(dirname(__file__), "_ext")))
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.5.5'
+needs_sphinx = '1.6.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.