From b37a32d4dc4beb82e994268af5129e897ec90c28 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 17 Feb 2020 14:44:41 +0300 Subject: [PATCH] builder: Add pip for python2 back --- builder/image-software.sh | 4 ++-- builder/test/tests.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builder/image-software.sh b/builder/image-software.sh index 7a85a87c..0bf412eb 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -121,9 +121,9 @@ sed -i "s/updates_available//" /usr/share/byobu/status/status echo_stamp "Installing pip" curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py +# Install pip for python2 first, so that pip binary will default to pip3 +python get-pip.py python3 get-pip.py -# Don't even bother installing pip for python2.7 -# python get-pip.py rm get-pip.py #my_travis_retry pip install --upgrade pip #my_travis_retry pip3 install --upgrade pip diff --git a/builder/test/tests.sh b/builder/test/tests.sh index aff0171a..b4dbb461 100755 --- a/builder/test/tests.sh +++ b/builder/test/tests.sh @@ -20,6 +20,8 @@ nmap --version lsof -v git --version vim --version +pip --version +pip2 --version pip3 --version tcpdump --version monkey --version