From 385508edfd8a216d53a53c394e7f38948ee2eb51 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Tue, 19 Jan 2016 20:29:46 -0500 Subject: [PATCH] Cap installed pip to be < 8 Pip 8 just release which made uninstalling distutils installed packages fatal. This was previously a deprecation warning and is now causing all dsvm jobs to fail. (cherry picked from commit 0ea729ac4908683141e5b1a9ca0d4a0d2390f5ad) Change-Id: I511d216d9d8619c7cf919c482aaead4e833cdaac Depends-On: I315351f91747d27bf735bdc3f2a527d773b029be --- tools/cap-pip.txt | 1 + tools/install_pip.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 tools/cap-pip.txt diff --git a/tools/cap-pip.txt b/tools/cap-pip.txt new file mode 100644 index 0000000000..1a6f80c506 --- /dev/null +++ b/tools/cap-pip.txt @@ -0,0 +1 @@ +pip<8 diff --git a/tools/install_pip.sh b/tools/install_pip.sh index 7b42c8c485..425d366a82 100755 --- a/tools/install_pip.sh +++ b/tools/install_pip.sh @@ -58,7 +58,7 @@ function install_get_pip { die $LINENO "Download of get-pip.py failed" touch $LOCAL_PIP.downloaded fi - sudo -H -E python $LOCAL_PIP + sudo -H -E python $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt }