From: David Galloway Date: Tue, 21 Apr 2020 18:57:17 +0000 (-0400) Subject: scripts: Stop using easy_install to upgrade pip X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=21e7a7b2d3aa4d49b3a38c8eab494adb8f928a4b;p=ceph-build.git scripts: Stop using easy_install to upgrade pip A recent pip release caused `easy_install --upgrade pip` to break all builds on non-CentOS7 machines. Let's assume it's safe to stop using easy_install to upgrade pip since we're not building on any ancient distros anymore. Signed-off-by: David Galloway --- diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index ac48b008..cddb693b 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -118,14 +118,6 @@ install_python_packages_no_binary () { PIP_SDIST_INDEX="$HOME/.cache/pip" mkdir -p $PIP_SDIST_INDEX - echo "Ensuring latest pip is installed" - # XXX This means we are now pinning to 10.0.0, to prevent issues on pip - # mismtaching versions, but also that we need to revisit this when newer - # options are needed. ``easy_install`` is a must on systems with ancient - # versions of pip that break with newer versions of pkg_resources that come - # with the virtualenv. Doing an initial upgrade with easy_install - # circumvents the problem - $VENV/easy_install --upgrade pip $VENV/pip install "pip==10.0.0" echo "Updating setuptools" @@ -157,14 +149,6 @@ install_python_packages () { PIP_SDIST_INDEX="$HOME/.cache/pip" mkdir -p $PIP_SDIST_INDEX - echo "Ensuring latest pip is installed" - # XXX This means we are now pinning to 10.0.0, to prevent issues on pip - # mismtaching versions, but also that we need to revisit this when newer - # options are needed. ``easy_install`` is a must on systems with ancient - # versions of pip that break with newer versions of pkg_resources that come - # with the virtualenv. Doing an initial upgrade with easy_install - # circumvents the problem - $VENV/easy_install --upgrade pip $VENV/pip install "pip==10.0.0" echo "Updating setuptools"