Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: update setuptools and wheel before pip install pkgs 

This allow to get precompiled package from pip depot instead of trying to compile them and failed without all dependencies
This commit is contained in:
Pierre Kancir 2023-05-16 10:27:25 +02:00 committed by Peter Barker
parent c05175074a
commit 5e32a04c72
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,9 +149,9 @@ fi
BASE_PKGS="build-essential ccache g++ gawk git make wget"
if [ ${RELEASE_CODENAME} == 'bionic' ]; then
# use fixed version for package that drop python2 support
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8==3.7.9 requests==2.27.1 monotonic==1.6 geocoder empy configparser==4.0.2 click==7.1.2 decorator==4.4.2 dronecan"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8==3.7.9 requests==2.27.1 monotonic==1.6 geocoder empy ptyprocess configparser==4.0.2 click==7.1.2 decorator==4.4.2 dronecan"
else
PYTHON_PKGS="wheel future lxml pymavlink MAVProxy pexpect flake8 geocoder empy dronecan"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8 geocoder empy ptyprocess dronecan"
fi
# add some Python packages required for commonly-used MAVProxy modules and hex file generation:
@ -167,7 +167,7 @@ ARM_LINUX_PKGS="g++-arm-linux-gnueabihf $INSTALL_PKG_CONFIG"
if [ ${RELEASE_CODENAME} == 'lunar' ]; then
# on Lunar (and presumably later releases), we install in venv, below
PYTHON_PKGS+=" setuptools numpy pyparsing psutil"
PYTHON_PKGS+=" numpy pyparsing psutil"
SITL_PKGS="python3-dev"
else
SITL_PKGS="libtool libxml2-dev libxslt1-dev ${PYTHON_V}-dev ${PYTHON_V}-pip ${PYTHON_V}-setuptools ${PYTHON_V}-numpy ${PYTHON_V}-pyparsing ${PYTHON_V}-psutil"
@ -359,6 +359,9 @@ if [ ${RELEASE_CODENAME} == 'bionic' ]; then
$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
$PIP install $PIP_USER_ARGUMENT -U setuptools wheel
if [ ${RELEASE_CODENAME} == 'lunar' ]; then
# must do this ahead of wxPython pip3 run :-/
$PIP install $PIP_USER_ARGUMENT -U attrdict3