CI: install sphinx with conda for doc build

jorisvandenbossche · jreback · commit c4efe3a68fb1 · 2016-02-02T09:35:46.000-06:00
Sphinx > 1.3.1 is now available in conda, so not needed to isntall this separately with pip to get latest version. Author: Joris Van den Bossche <jorisvandenbossche@gmail.com> Closes pandas-dev#12204 from jorisvandenbossche/travis-full-doc and squashes the following commits: 16973e8 [Joris Van den Bossche] CI: install sphinx with conda for doc build
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -18,7 +18,6 @@ if [ x"$DOC_BUILD" != x"" ]; then
 
     source activate pandas
     conda install -n pandas -c r r rpy2 --yes
-    pip install sphinx -U
 
     time sudo apt-get $APT_ARGS install dvipng
 
diff --git a/ci/requirements-2.7_DOC_BUILD.run b/ci/requirements-2.7_DOC_BUILD.run
@@ -1,4 +1,5 @@
 ipython
+sphinx
 nbconvert
 matplotlib
 scipy

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`ipython`
	`2`	`+sphinx`
`2`	`3`	`nbconvert`
`3`	`4`	`matplotlib`
`4`	`5`	`scipy`