RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-24 11:17:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-06-01 14:05:07 +08:00
parent 037d6a7d87
commit 30ce5e5546
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install-deps.sh
View File

@ -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

3
src/tools/setup-virtualenv.sh
View File

@ -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