CI: install sphinx with conda for doc build

jorisvandenbossche · jorisvandenbossche · commit 16973e89dc7b · 2016-02-02T14:43:46.000+01:00
Sphinx &gt; 1.3.1 is now available in conda,
so not needed to isntall this separately with pip to get latest version.
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
