Merge pull request #13805 from timhoffm/pin-sphinx-1.x

tacaswell · tacaswell · commit 38fc99e8874c · 2019-03-31T00:48:08.000-04:00
BLD: Pin Sphinx to 1.x

Conflicts:
	requirements/doc/doc-requirements.txt
          - the v3.1 branch support sphinx &lt; 1.8 and carries a bunch
            of known-bad version exclusions
diff --git a/requirements/doc/doc-requirements.txt b/requirements/doc/doc-requirements.txt
@@ -7,7 +7,7 @@
 # Install the documentation requirements with:
 #     pip install -r requirements/doc/doc-requirements.txt
 #
-sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3,!=1.8.0
+sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3,!=1.8.0<2.0.0
 colorspacious
 ipython
 ipywidgets

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