Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: remove bionic fixed package as we move to py3

Browse Source
This commit is contained in:
Pierre Kancir 2023-08-23 00:23:18 +02:00 committed by Peter Barker
parent 69a42cafb3
commit 875f834e93
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tools/environment_install/install-prereqs-ubuntu.sh
View File

@ -148,20 +148,11 @@ fi
# Lists of packages to install # Lists of packages to install
BASE_PKGS="build-essential ccache g++ gawk git make wget valgrind screen" BASE_PKGS="build-essential ccache g++ gawk git make wget valgrind screen"
PYTHON_PKGS="future lxml pymavlink pyserial MAVProxy pexpect geocoder empy ptyprocess dronecan" PYTHON_PKGS="future lxml pymavlink pyserial MAVProxy pexpect geocoder empy ptyprocess dronecan"
if [ ${RELEASE_CODENAME} == 'bionic' ]; then PYTHON_PKGS="$PYTHON_PKGS flake8"
# use fixed version for package that drop python2 support
PYTHON_PKGS="$PYTHON_PKGS flake8==3.7.9 requests==2.27.1 monotonic==1.6 configparser==4.0.2 click==7.1.2 decorator==4.4.2"
else
PYTHON_PKGS="$PYTHON_PKGS flake8"
fi
# add some Python packages required for commonly-used MAVProxy modules and hex file generation: # add some Python packages required for commonly-used MAVProxy modules and hex file generation:
if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then
if [ ${RELEASE_CODENAME} == 'bionic' ]; then
PYTHON_PKGS="$PYTHON_PKGS pygame==2.0.3 intelhex"
else
PYTHON_PKGS="$PYTHON_PKGS pygame intelhex" PYTHON_PKGS="$PYTHON_PKGS pygame intelhex"
fi
fi fi
ARM_LINUX_PKGS="g++-arm-linux-gnueabihf $INSTALL_PKG_CONFIG" ARM_LINUX_PKGS="g++-arm-linux-gnueabihf $INSTALL_PKG_CONFIG"
# python-wxgtk packages are added to SITL_PKGS below # python-wxgtk packages are added to SITL_PKGS below
@ -356,12 +347,6 @@ if [ ${RELEASE_CODENAME} == 'lunar' ]; then
fi fi
fi fi
# Update Pip and Setuptools on old distro
if [ ${RELEASE_CODENAME} == 'bionic' ]; then
# use fixed version for package that drop python2 support
$PIP install --user -U pip==20.3 setuptools==44.0.0
fi
# try update setuptools and wheel before installing pip package that may need compilation # try update setuptools and wheel before installing pip package that may need compilation
$PIP install $PIP_USER_ARGUMENT -U pip setuptools wheel $PIP install $PIP_USER_ARGUMENT -U pip setuptools wheel