From 30ce5e55460e333e1240704112a16fae68b3325f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 1 Jun 2017 14:05:07 +0800 Subject: [PATCH] install-deps.sh: workaround setuptools' dependency on six see also https://github.com/pypa/setuptools/issues/1042 Signed-off-by: Kefu Chai --- install-deps.sh | 3 ++- src/tools/setup-virtualenv.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/install-deps.sh b/install-deps.sh index 42c34e68f43..ec3d1739194 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -160,7 +160,8 @@ function populate_wheelhouse() { # although pip comes with virtualenv, having a recent version # of pip matters when it comes to using wheel packages - pip --timeout 300 $install 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' || return 1 + # 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 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 444b967368e..c7680b9558b 100755 --- a/src/tools/setup-virtualenv.sh +++ b/src/tools/setup-virtualenv.sh @@ -31,6 +31,9 @@ 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