From ac6d7e6730951e349e1d9ca36331365c4fce9b90 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Mon, 13 Jan 2020 18:26:02 +0100
Subject: [PATCH] setup: another try to install pip dependencies

---
 Tools/setup/ubuntu.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Tools/setup/ubuntu.sh b/Tools/setup/ubuntu.sh
index b362937d13..abb425c057 100755
--- a/Tools/setup/ubuntu.sh
+++ b/Tools/setup/ubuntu.sh
@@ -96,9 +96,11 @@ sudo apt-get -yy --quiet --no-install-recommends install \
 	python3 \
 	python3-dev \
 	python3-pip \
+	python-setuptools \
 	python \
 	python-dev \
 	python-pip \
+	python3-setuptools \
 	rsync \
 	shellcheck \
 	unzip \
@@ -116,16 +118,12 @@ fi
 # Python3 dependencies
 echo
 echo "Installing PX4 Python3 dependencies"
-pip3 install --user --upgrade pip setuptools wheel
-hash -d pip3 # Needed to prevent ImportError: cannot import name 'main'
 pip3 install --user -r ${DIR}/requirements.txt
 
 
 # Python2 dependencies
 echo
 echo "Installing PX4 Python2 dependencies"
-pip install --user --upgrade pip setuptools wheel
-hash -d pip3 # Needed to prevent ImportError: cannot import name 'main'
 pip install --user -r ${DIR}/requirements.txt