px4-dev: Try to move to Python 3

PX4 · Oct 7, 2019 · 8e77928 · 8e77928
1 parent 7dba6f4
commit 8e77928
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/docker/px4-dev/Dockerfile_base-bionic b/docker/px4-dev/Dockerfile_base-bionic
@@ -35,9 +35,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 \
@@ -56,9 +56,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
@@ -35,9 +35,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 \
@@ -56,9 +56,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 \