commit 279a7589b03db69fd1b85d947cd0171dacef94ee
author Jens Harbott (frickler) <j.harbott@x-ion.de> Mon Apr 16 12:08:30 2018 +0000
committer Jens Harbott <j.harbott@x-ion.de> Wed Nov 20 21:02:39 2019 +0000
tree 00d473d08d0fbe73f39ab99af0df13d95453cb27
parent 48b519b5c62be33388b76fd25eebb5673d1e2c18

Revert "Do not use pip 10 or higher"

This reverts commit f99d1771ba1882dfbb69186212a197edae3ef02c.

Added workarounds that might want to get split into their own patch
before merging:

- Don't install python-psutil
- Don't run peakmem_tracker

Change-Id: If4fb16555e15082a4d97cffdf3cfa608a682997d

tools/install_pip.sh

diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index 2b6aa4c..dcd5466 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -89,9 +89,9 @@
             die $LINENO "Download of get-pip.py failed"
         touch $LOCAL_PIP.downloaded
     fi
-    sudo -H -E python $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt
-    if python3_enabled; then
-        sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt
+    sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP
+    if ! python3_enabled; then
+        sudo -H -E python $LOCAL_PIP
     fi
 }