From 1d27155f650e9b8e4053a201f1f08c494b820de2 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. Depends-On: I511d216d9d8619c7cf919c482aaead4e833cdaac Change-Id: I22f5c3af1adf96cfbd5747122f915a82e947843a --- tools/cap-pip.txt | 1 + tools/install_pip.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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 f239c7bb16..542a28454d 100755 --- a/tools/install_pip.sh +++ b/tools/install_pip.sh @@ -77,9 +77,9 @@ 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 if python3_enabled; then - sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP + sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt fi }