From 16973e89dc7b8447186af54ce37ebb05550f39bd Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Tue, 2 Feb 2016 14:43:41 +0100
Subject: [PATCH] CI: install sphinx with conda for doc build

Sphinx > 1.3.1 is now available in conda,
so not needed to isntall this separately with pip to get latest version.
---
 ci/build_docs.sh                  | 1 -
 ci/requirements-2.7_DOC_BUILD.run | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index a906b78de5389..c0843593f85ff 100755
--- 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
index 33033defc8faa..854776762fdb5 100644
--- 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