Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ubuntu.py: update to dual install to Python2 #12788

Merged
merged 3 commits into from
Sep 2, 2019
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Tools/setup/ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ sudo apt-get -yy --quiet --no-install-recommends install \
python3-pip \
python3-pygments \
python3-setuptools \
python-pip \
python-dev \
rsync \
shellcheck \
unzip \
Expand All @@ -88,6 +90,14 @@ echo "Installing PX4 Python3 dependencies"
sudo python3 -m pip install --upgrade pip setuptools wheel
sudo python3 -m pip install -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


# NuttX toolchain (arm-none-eabi-gcc)
if [[ $INSTALL_NUTTX == "true" ]]; then

Expand Down Expand Up @@ -148,8 +158,8 @@ if [[ $INSTALL_SIM == "true" ]]; then
# java (jmavsim or fastrtps)
sudo apt-get -yy --quiet --no-install-recommends install \
ant \
default-jre-headless \
default-jdk-headless \
openjdk-8-jre \
openjdk-8-jdk \
;

# Gazebo
Expand Down