From 58836317a53bb28113df7a05b4c87e9a6e7320bb Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Mon, 6 Feb 2017 15:13:53 +0100 Subject: [PATCH] DOC/CI: ensure correct pandas version (GH15311) --- ci/build_docs.sh | 2 +- ci/requirements-3.5_DOC_BUILD.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 4dc9a203f1978..5dc649a91c4f7 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -22,8 +22,8 @@ if [ x"$DOC_BUILD" != x"" ]; then echo "Will build docs" source activate pandas - conda install -n pandas -c r r rpy2 --yes + # install sudo deps time sudo apt-get $APT_ARGS install dvipng texlive-latex-base texlive-latex-extra mv "$TRAVIS_BUILD_DIR"/doc /tmp diff --git a/ci/requirements-3.5_DOC_BUILD.sh b/ci/requirements-3.5_DOC_BUILD.sh index ca18ad976d46d..25bc63acc96d1 100644 --- a/ci/requirements-3.5_DOC_BUILD.sh +++ b/ci/requirements-3.5_DOC_BUILD.sh @@ -2,6 +2,8 @@ source activate pandas -echo "install DOC_BUILD" +echo "[install DOC_BUILD deps]" conda install -n pandas -c conda-forge feather-format + +conda install -n pandas -c r r rpy2 --yes