From bf62b0f5e681bf1e9d245bc8bc2ba4147bbbf1d6 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Mon, 13 Jan 2020 15:13:37 +0100
Subject: [PATCH] setup: use pip as user, don't forget python3-dev

In my opinion we should not mess with someones system Python
dependencies.
---
 Tools/setup/requirements.txt |  1 +
 Tools/setup/ubuntu.sh        | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Tools/setup/requirements.txt b/Tools/setup/requirements.txt
index 0908b55e61..72b352f850 100644
--- a/Tools/setup/requirements.txt
+++ b/Tools/setup/requirements.txt
@@ -10,6 +10,7 @@ psutil
 pyserial>=3.0
 pyulog>=0.5.0
 pyyaml
+pygments
 setuptools>=39.2.0
 six>=1.12.0
 toml>=0.9
diff --git a/Tools/setup/ubuntu.sh b/Tools/setup/ubuntu.sh
index df8ce4ec4d..a40155e87c 100755
--- a/Tools/setup/ubuntu.sh
+++ b/Tools/setup/ubuntu.sh
@@ -92,11 +92,12 @@ sudo apt-get -yy --quiet --no-install-recommends install \
 	lcov \
 	make \
 	ninja-build \
+	python3 \
+	python3-dev \
 	python3-pip \
-	python3-pygments \
-	python3-setuptools \
-	python-pip \
+	python \
 	python-dev \
+	python-pip \
 	rsync \
 	shellcheck \
 	unzip \
@@ -115,15 +116,15 @@ fi
 # Python3 dependencies
 echo
 echo "Installing PX4 Python3 dependencies"
-sudo python3 -m pip install --upgrade pip setuptools wheel
-sudo python3 -m pip install -r ${DIR}/requirements.txt
+pip3 install --user --upgrade setuptools wheel
+pip3 install --user -r ${DIR}/requirements.txt
 
 
 # Python2 dependencies
 echo
 echo "Installing PX4 Python2 dependencies"
-sudo python2 -m pip install --upgrade pip setuptools wheel
-sudo python2 -m pip install -r ${DIR}/requirements.txt
+pip install --user --upgrade setuptools wheel
+pip install --user -r ${DIR}/requirements.txt
 
 
 # NuttX toolchain (arm-none-eabi-gcc)