Pin to sphinx<1.8; unremove sphinxext.mathmpl. (#12109)

anntzer · timhoffm · commit 6ff52873b5a4 · 2018-09-13T23:43:55.000+02:00
diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -6,7 +6,7 @@
 # Install the documentation requirements with:
 #     pip install -r doc-requirements.txt
 #
-sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3
+sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3,<1.8
 colorspacious
 ipython
 ipywidgets
diff --git a/doc/conf.py b/doc/conf.py
@@ -37,15 +37,14 @@
     'IPython.sphinxext.ipython_directive',
     'numpydoc',  # Needs to be loaded *after* autodoc.
     'sphinx_gallery.gen_gallery',
+    'matplotlib.sphinxext.mathmpl',
     'matplotlib.sphinxext.plot_directive',
     'sphinxext.custom_roles',
     'sphinxext.github',
     'sphinxext.math_symbol_table',
     'sphinxext.mock_gui_toolkits',
     'sphinxext.skip_deprecated',
 ]
-if sphinx.version_info < (1, 8):
-    extensions.append('matplotlib.sphinxext.mathmpl')
 
 exclude_patterns = ['api/api_changes/*', 'users/whats_new/*']
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Install the documentation requirements with:`
`7`	`7`	`# pip install -r doc-requirements.txt`
`8`	`8`	`#`
`9`		`-sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3`
	`9`	`+sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3,<1.8`
`10`	`10`	`colorspacious`
`11`	`11`	`ipython`
`12`	`12`	`ipywidgets`