You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/06/03 15:16:59 UTC
[arrow] branch master updated: ARROW-5390: [CI] Stop testing Python
2.7 on Travis-CI [skip appveyor]
This is an automated email from the ASF dual-hosted git repository.
wesm 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 4dda722 ARROW-5390: [CI] Stop testing Python 2.7 on Travis-CI [skip appveyor]
4dda722 is described below
commit 4dda722b4a97db3290ea8be7c280c642b2063cc5
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Mon Jun 3 10:15:48 2019 -0500
ARROW-5390: [CI] Stop testing Python 2.7 on Travis-CI [skip appveyor]
Author: Antoine Pitrou <an...@python.org>
Closes #4457 from pitrou/ARROW-5390-travis-py27 and squashes the following commits:
af32347ac <Antoine Pitrou> ARROW-5390: Stop testing Python 2.7 on Travis-CI
---
.travis.yml | 9 +++------
ci/travis_script_python.sh | 12 +++++-------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 622e820..efeaf20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,7 +113,7 @@ matrix:
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1
- $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1
- $TRAVIS_BUILD_DIR/ci/travis_upload_cpp_coverage.sh || travis_terminate 1
- - name: "Python 2.7 and 3.6 unit tests w/ Valgrind, conda-forge toolchain, coverage"
+ - name: "Python 3.6 unit tests w/ Valgrind, conda-forge toolchain, coverage"
compiler: gcc
language: cpp
os: linux
@@ -138,11 +138,9 @@ matrix:
- $TRAVIS_BUILD_DIR/ci/travis_install_toolchain.sh
script:
- $TRAVIS_BUILD_DIR/ci/travis_script_java.sh || travis_terminate 1
- - ARROW_TRAVIS_PYTHON_GANDIVA=1
+ - export ARROW_TRAVIS_PYTHON_GANDIVA=1
# Only run Plasma tests with valgrind in one of the Python builds because
# they are slow
- - export PLASMA_VALGRIND=0
- - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 2.7 || travis_terminate 1
- export PLASMA_VALGRIND=1
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 3.6 || travis_terminate 1
- $TRAVIS_BUILD_DIR/ci/travis_upload_cpp_coverage.sh
@@ -190,12 +188,11 @@ matrix:
before_script:
script:
- if [ $ARROW_CI_PYTHON_AFFECTED != "1" ]; then exit; fi
- - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 2.7 || travis_terminate 1
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 3.6
- name: "[manylinux1] Python"
language: cpp
env:
- - PYTHON_VERSIONS="2.7,32 3.6,16"
+ - PYTHON_VERSIONS="3.6,16 3.7,16"
before_script:
- if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then docker-compose pull python-manylinux1; fi
script:
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index 1eb06fb..7d8da4b 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -58,7 +58,7 @@ conda activate $CONDA_ENV_DIR
python --version
which python
-if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ] && [ "$PYTHON_VERSION" == "3.6" ]; then
+if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ]; then
# Install documentation dependencies
conda install -y --file ci/conda_env_sphinx.yml
fi
@@ -139,9 +139,7 @@ $ARROW_CPP_BUILD_DIR/$ARROW_BUILD_TYPE/arrow-python-test
pushd $ARROW_PYTHON_DIR
-if [ "$PYTHON_VERSION" == "3.6" ]; then
- pip install -q pickle5
-fi
+pip install -q pickle5
if [ "$ARROW_TRAVIS_COVERAGE" == "1" ]; then
export PYARROW_GENERATE_COVERAGE=1
pip install -q coverage
@@ -156,7 +154,7 @@ export PYARROW_BUILD_TYPE=$ARROW_BUILD_TYPE
export PYARROW_WITH_PARQUET=1
export PYARROW_WITH_PLASMA=1
export PYARROW_WITH_ORC=1
-if [ "$ARROW_TRAVIS_FLIGHT" == "1" ] && [ "$PYTHON_VERSION" != "2.7" ]; then
+if [ "$ARROW_TRAVIS_FLIGHT" == "1" ]; then
export PYARROW_WITH_FLIGHT=1
fi
if [ "$ARROW_TRAVIS_PYTHON_GANDIVA" == "1" ]; then
@@ -210,7 +208,7 @@ if [ "$ARROW_TRAVIS_COVERAGE" == "1" ]; then
popd # $TRAVIS_BUILD_DIR
fi
-if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ] && [ "$PYTHON_VERSION" == "3.6" ]; then
+if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ]; then
pushd ../cpp/apidoc
doxygen
popd
@@ -220,7 +218,7 @@ fi
popd # $ARROW_PYTHON_DIR
-if [ "$ARROW_TRAVIS_PYTHON_BENCHMARKS" == "1" ] && [ "$PYTHON_VERSION" == "3.6" ]; then
+if [ "$ARROW_TRAVIS_PYTHON_BENCHMARKS" == "1" ]; then
# Check the ASV benchmarking setup.
# Unfortunately this won't ensure that all benchmarks succeed
# (see https://github.com/airspeed-velocity/asv/issues/449)