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

dstansby · web-flow · commit 06e3dd06f538 · 2018-09-15T16:53:29.000+01:00
Fix circleCI 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,<1.8
 colorspacious
 ipython
 ipywidgets

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`