Merge pull request #8648 from dstansby/sphinx-161

QuLogic · web-flow · commit fc6a7bad8e70 · 2017-05-20T18:58:22.000-04:00
Don't require sphinx-gallery&lt;1.6
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
+sphinx>=1.3,!=1.5.0
 colorspacious
 ipython
 mock
diff --git a/doc/devel/MEP/MEP12.rst b/doc/devel/MEP/MEP12.rst
@@ -195,7 +195,3 @@ navigate the gallery. Thus, tags are complementary to this reorganization.
 .. _PEP8: https://www.python.org/dev/peps/pep-0008/
 
 .. [1] https://github.com/matplotlib/matplotlib/pull/714
-.. [2] https://github.com/matplotlib/matplotlib/issues/524
-.. [3] http://matplotlib.1069221.n5.nabble.com/Matplotlib-gallery-td762.html#a33379091
-.. [4] http://www.labri.fr/perso/nrougier/teaching/matplotlib/
-.. [5] http://www.labri.fr/perso/nrougier/coding/gallery/
diff --git a/tutorials/colors/colormaps.py b/tutorials/colors/colormaps.py
@@ -388,8 +388,6 @@ def plot_color_gradients(cmap_category, cmap_list):
 # .. [list-colormaps] https://gist.github.com/endolith/2719900#id7
 # .. [mycarta-banding] https://mycarta.wordpress.com/2012/10/14/the-rainbow-is-deadlong-live-the-rainbow-part-4-cie-lab-heated-body/
 # .. [mycarta-jet] https://mycarta.wordpress.com/2012/10/06/the-rainbow-is-deadlong-live-the-rainbow-part-3/
-# .. [mycarta-lablinear] https://mycarta.wordpress.com/2012/12/06/the-rainbow-is-deadlong-live-the-rainbow-part-5-cie-lab-linear-l-rainbow/
-# .. [mycarta-cubelaw] https://mycarta.wordpress.com/2013/02/21/perceptual-rainbow-palette-the-method/
 # .. [bw] http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/
 # .. [colorblindness] http://www.color-blindness.com/
 # .. [vischeck] http://www.vischeck.com/vischeck/

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`
	`9`	`+sphinx>=1.3,!=1.5.0`
`10`	`10`	`colorspacious`
`11`	`11`	`ipython`
`12`	`12`	`mock`