Merge pull request #14846 from dstansby/v2.2.x

dstansby · web-flow · commit 353f432e85e6 · 2019-07-23T09:11:30.000+01:00
Fix circleCI build on 2.2.x
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,<2
 colorspacious
 ipython
 ipywidgets
diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst
@@ -25,13 +25,6 @@ Jae-Joon Lee has written :mod:`~matplotlib.gridspec`, a new module for
 doing complex subplot layouts, featuring row and column spans and
 more.  See :doc:`/tutorials/intermediate/gridspec` for a tutorial overview.
 
-.. figure:: ../../gallery/userdemo/images/sphx_glr_demo_gridspec01_000.png
-   :target: ../../gallery/userdemo/demo_gridspec01.html
-   :align: center
-   :scale: 50
-
-   Demo Gridspec01
-
 Easy pythonic subplots
 -----------------------
 

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,<2`
`10`	`10`	`colorspacious`
`11`	`11`	`ipython`
`12`	`12`	`ipywidgets`