From c27bf52be4a1ea4e08503af36355d6d8f442e810 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Mon, 26 Aug 2019 15:07:50 +0200
Subject: [PATCH] px4-dev: Try to move to Python 3

---
 docker/px4-dev/Dockerfile_base-bionic | 12 ++++++------
 docker/px4-dev/Dockerfile_base-xenial | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/px4-dev/Dockerfile_base-bionic b/docker/px4-dev/Dockerfile_base-bionic
index 2c9e43c7..802ffc69 100644
--- a/docker/px4-dev/Dockerfile_base-bionic
+++ b/docker/px4-dev/Dockerfile_base-bionic
@@ -34,9 +34,9 @@ RUN apt-get update && apt-get -y --quiet --no-install-recommends install \
 		openjdk-8-jre \
 		openssh-client \
 		pkg-config \
-		python-pip \
-		python-pygments \
-		python-setuptools \
+		python3-pip \
+		python3-pygments \
+		python3-setuptools \
 		rsync \
 		shellcheck \
 		tzdata \
@@ -55,9 +55,9 @@ RUN cd /usr/src/gtest \
 	&& cp *.a /usr/lib \
 	&& cd .. && rm -rf build
 
-RUN python -m pip install --upgrade pip \
-	&& pip install setuptools pkgconfig wheel \
-	&& pip install argparse argcomplete coverage jinja2 empy numpy requests serial toml pyyaml cerberus
+RUN python3 -m pip install --upgrade pip \
+	&& pip3 install setuptools pkgconfig wheel \
+	&& pip3 install argparse argcomplete coverage jinja2 empy numpy requests serial toml pyyaml cerberus
 
 # manual ccache setup
 RUN ln -s /usr/bin/ccache /usr/lib/ccache/cc \
diff --git a/docker/px4-dev/Dockerfile_base-xenial b/docker/px4-dev/Dockerfile_base-xenial
index c58f1b5e..4e62f05c 100644
--- a/docker/px4-dev/Dockerfile_base-xenial
+++ b/docker/px4-dev/Dockerfile_base-xenial
@@ -34,9 +34,9 @@ RUN apt-get update && apt-get -y --quiet --no-install-recommends install \
 		openjdk-8-jre \
 		openssh-client \
 		pkg-config \
-		python-pip \
-		python-pygments \
-		python-setuptools \
+		python3-pip \
+		python3-pygments \
+		python3-setuptools \
 		rsync \
 		shellcheck \
 		tzdata \
@@ -55,9 +55,9 @@ RUN cd /usr/src/gtest \
 	&& cp *.a /usr/lib \
 	&& cd .. && rm -rf build
 
-RUN python -m pip install --upgrade pip \
-	&& pip install setuptools pkgconfig wheel \
-	&& pip install argparse argcomplete coverage jinja2 empy numpy requests serial toml pyyaml cerberus
+RUN python3 -m pip install --upgrade pip \
+	&& pip3 install setuptools pkgconfig wheel \
+	&& pip3 install argparse argcomplete coverage jinja2 empy numpy requests serial toml pyyaml cerberus
 
 # manual ccache setup
 RUN ln -s /usr/bin/ccache /usr/lib/ccache/cc \