From 6e0f358419f8c6051baed140a6685384ec5771d1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 27 Jan 2019 01:20:53 +0800 Subject: [PATCH] install-deps.sh: use latest setuptools this change reverts "install-deps.sh: workaround setuptools' dependency on six" This reverts commit 30ce5e55460e333e1240704112a16fae68b3325f. tl;dr: this change addresses the failures of "make check" runs on arm64 builders when they try to build `mgr-dashboard-test-venv` target. long story: without this change, we will fail to pull in setuptools >= 36, and as a result pip will fail to import `setuptools.build_meta` in `pip/_vendor/pep517/_in_process.py`. and will a `BackendUnavailable` exception thrown by `_call_hook()` in `pip/_vendor/pep517/wrappers.py`. since the issue addressed by 30ce5e55 has been addressed since setuptools >= 36.0.1, we should be safe to upgrade to the latest setuptools now. Signed-off-by: Kefu Chai (cherry picked from commit 8b55b47cc75e43ef683cd230f792cd92f1c46fa7) --- install-deps.sh | 3 +-- src/tools/setup-virtualenv.sh | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index e102bd034fbab..fd21a3d1b1882 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -301,8 +301,7 @@ function populate_wheelhouse() { # although pip comes with virtualenv, having a recent version # of pip matters when it comes to using wheel packages - # workaround of https://github.com/pypa/setuptools/issues/1042 - pip --timeout 300 $install 'setuptools >= 0.8,< 36' 'pip >= 7.0' 'wheel >= 0.24' || return 1 + pip --timeout 300 $install 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' || return 1 if test $# != 0 ; then pip --timeout 300 $install $@ || return 1 fi diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh index 9fef726a21e85..89e50b744ff97 100755 --- a/src/tools/setup-virtualenv.sh +++ b/src/tools/setup-virtualenv.sh @@ -71,9 +71,6 @@ fi # when using wheel packages pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1' -# workaround of https://github.com/pypa/setuptools/issues/1042 -pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36" - if pip --help | grep -q disable-pip-version-check; then DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check else -- 2.39.5