From: Kefu Chai <kchai@redhat.com>
Date: Thu, 1 Jun 2017 06:05:07 +0000 (+0800)
Subject: install-deps.sh: workaround setuptools' dependency on six
X-Git-Tag: ses5-milestone6~9^2~39^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15406%2Fhead;p=ceph.git

install-deps.sh: workaround setuptools' dependency on six

see also https://github.com/pypa/setuptools/issues/1042

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/install-deps.sh b/install-deps.sh
index 42c34e68f434..ec3d17391949 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 444b967368ed..c7680b9558b9 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