Repository: arrow Updated Branches: refs/heads/master cfcee74ba -> 8fd73b48c
ARROW-1595: [Python] Fix package dependency resolution issue causing broken builds One of the dependencies installed in the docs requirements is causing NumPy to get downgraded by the SAT solver, and this is then causing an ABI conflict with the pyarrow build (which was built with a different version of NumPy). This installs everything in one `conda install` call Author: Wes McKinney <wes.mckin...@twosigma.com> Closes #1123 from wesm/ARROW-1595 and squashes the following commits: 60b05ad5 [Wes McKinney] Install conda dependencies all at once, pin NumPy version Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/8fd73b48 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/8fd73b48 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/8fd73b48 Branch: refs/heads/master Commit: 8fd73b48c852ea5d419dea48dd7d7eded00674dd Parents: cfcee74 Author: Wes McKinney <wes.mckin...@twosigma.com> Authored: Thu Sep 21 19:26:28 2017 -0400 Committer: Wes McKinney <wes.mckin...@twosigma.com> Committed: Thu Sep 21 19:26:28 2017 -0400 ---------------------------------------------------------------------- ci/travis_script_python.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/8fd73b48/ci/travis_script_python.sh ---------------------------------------------------------------------- diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh index f6ce18a..b779aec 100755 --- a/ci/travis_script_python.sh +++ b/ci/travis_script_python.sh @@ -34,11 +34,16 @@ source activate $CONDA_ENV_DIR python --version which python -# faster builds, please -conda install -y -q nomkl - -# Expensive dependencies install from Continuum package repo -conda install -y -q pip numpy pandas cython +conda install -y -q pip \ + nomkl \ + numpy=1.13.1 \ + pandas \ + cython \ + ipython \ + matplotlib \ + numpydoc \ + sphinx \ + sphinx_bootstrap_theme # Build C++ libraries pushd $ARROW_CPP_BUILD_DIR @@ -80,7 +85,6 @@ python -m pytest -vv -r sxX -s $PYARROW_PATH --parquet if [ "$PYTHON_VERSION" == "3.6" ] && [ $TRAVIS_OS_NAME == "linux" ]; then # Build documentation once pushd $ARROW_PYTHON_DIR/doc - conda install -y -q --file=requirements.txt sphinx-build -b html -d _build/doctrees -W source _build/html popd fi
