You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ap...@apache.org on 2018/12/17 14:56:53 UTC
[arrow] branch master updated: ARROW-4041: [CI] Python 2.7 run uses
Python 3.6
This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 51f5e94 ARROW-4041: [CI] Python 2.7 run uses Python 3.6
51f5e94 is described below
commit 51f5e94612c92e81017898ab753f04dd55a868d0
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Mon Dec 17 15:56:45 2018 +0100
ARROW-4041: [CI] Python 2.7 run uses Python 3.6
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #3190 from kszucs/ARROW-4041 and squashes the following commits:
75d3cc91 <Krisztián Szűcs> remove python from env file
3abec8a7 <Krisztián Szűcs> single conda create command
ba6a820e <Krisztián Szűcs> don't update python on travis
---
ci/conda_env_python.yml | 1 -
ci/travis_install_toolchain.sh | 1 -
ci/travis_script_python.sh | 15 ++++++++-------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ci/conda_env_python.yml b/ci/conda_env_python.yml
index c187155..d3756cb 100644
--- a/ci/conda_env_python.yml
+++ b/ci/conda_env_python.yml
@@ -22,7 +22,6 @@ nomkl
numpy
pandas
pytest
-python
rsync
setuptools
setuptools_scm
diff --git a/ci/travis_install_toolchain.sh b/ci/travis_install_toolchain.sh
index 86ac56d..82031e8 100755
--- a/ci/travis_install_toolchain.sh
+++ b/ci/travis_install_toolchain.sh
@@ -31,7 +31,6 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
--file=$TRAVIS_BUILD_DIR/ci/conda_env_cpp.yml \
${CONDA_LLVM} \
ccache \
- curl \
ninja \
nomkl \
python=3.6
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index 6d96ebe..b8385c3 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -32,9 +32,6 @@ PYARROW_PYTEST_FLAGS=" -r sxX --durations=15 --parquet"
PYTHON_VERSION=$1
CONDA_ENV_DIR=$TRAVIS_BUILD_DIR/pyarrow-test-$PYTHON_VERSION
-conda create -y -q -p $CONDA_ENV_DIR python=$PYTHON_VERSION cmake curl
-conda activate $CONDA_ENV_DIR
-
# We should use zlib in the target Python directory to avoid loading
# wrong libpython on macOS at run-time. If we use zlib in
# $ARROW_BUILD_TOOLCHAIN and libpython3.6m.dylib exists in both
@@ -44,19 +41,23 @@ conda activate $CONDA_ENV_DIR
# python-test fails.
export ZLIB_HOME=$CONDA_ENV_DIR
-python --version
-which python
-
if [ $ARROW_TRAVIS_PYTHON_JVM == "1" ]; then
CONDA_JVM_DEPS="jpype1"
fi
-conda install -y -q \
+conda create -y -q -p $CONDA_ENV_DIR \
--file $TRAVIS_BUILD_DIR/ci/conda_env_python.yml \
+ cmake \
pip \
numpy=1.13.1 \
+ python=${PYTHON_VERSION} \
${CONDA_JVM_DEPS}
+conda activate $CONDA_ENV_DIR
+
+python --version
+which python
+
if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ] && [ "$PYTHON_VERSION" == "3.6" ]; then
# Install documentation dependencies
conda install -y -c conda-forge --file ci/conda_env_sphinx.yml