From 624f1036eb1e02d89679db83bc9ad95af70b743a Mon Sep 17 00:00:00 2001 From: HyukjinKwon Date: Fri, 3 Apr 2020 19:51:29 +0900 Subject: [PATCH 1/2] Revert "[SPARK-31231][BUILD][FOLLOW-UP] Set the upper bound (before 46.1.0) for setuptools in pip package test" This reverts commit 178d472e1d9f9f61fa54866d00d0a5b88ee87619. --- dev/run-pip-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/run-pip-tests b/dev/run-pip-tests index 928d40eb19e2..dc9582a11f54 100755 --- a/dev/run-pip-tests +++ b/dev/run-pip-tests @@ -76,7 +76,7 @@ for python in "${PYTHON_EXECS[@]}"; do VIRTUALENV_PATH="$VIRTUALENV_BASE"/$python rm -rf "$VIRTUALENV_PATH" if [ -n "$USE_CONDA" ]; then - conda create -y -p "$VIRTUALENV_PATH" python=$python numpy pandas pip "setuptools<46.1.0" + conda create -y -p "$VIRTUALENV_PATH" python=$python numpy pandas pip setuptools=46.0.0 source activate "$VIRTUALENV_PATH" else mkdir -p "$VIRTUALENV_PATH" From 337c948272d169c405d3c1442db75d287833b401 Mon Sep 17 00:00:00 2001 From: HyukjinKwon Date: Fri, 3 Apr 2020 19:51:36 +0900 Subject: [PATCH 2/2] Revert "[SPARK-31231][BUILD] Explicitly setuptools version as 46.0.0 in pip package test" This reverts commit c181c45f863ba55e15ab9b41f635ffbddad9bac0. --- dev/run-pip-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/run-pip-tests b/dev/run-pip-tests index dc9582a11f54..470f21e69d46 100755 --- a/dev/run-pip-tests +++ b/dev/run-pip-tests @@ -76,7 +76,7 @@ for python in "${PYTHON_EXECS[@]}"; do VIRTUALENV_PATH="$VIRTUALENV_BASE"/$python rm -rf "$VIRTUALENV_PATH" if [ -n "$USE_CONDA" ]; then - conda create -y -p "$VIRTUALENV_PATH" python=$python numpy pandas pip setuptools=46.0.0 + conda create -y -p "$VIRTUALENV_PATH" python=$python numpy pandas pip setuptools source activate "$VIRTUALENV_PATH" else mkdir -p "$VIRTUALENV_PATH"