aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: install-prereqs-ubuntu.sh: fix script after setuptools==71.0.0 release

Browse Source 
Use newest `packaging` to avoid packaging incompatibility with `setuptools>=71.0`

As https://github.com/pypa/setuptools/issues/4496#issuecomment-2240322375 mentions:
> setuptools>=71.0 does not work with packaging<24.0, but will not upgrade it if packaging is already installed

Also relevant: https://github.com/pypa/setuptools/issues/4496
This commit is contained in:
Ben Butterworth 2024-07-22 13:08:12 +01:00 committed by Peter Barker
parent b6adb4c7e7
commit 0a9a8d9178
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/environment_install/install-prereqs-arch.sh
View File

@ -26,7 +26,7 @@ BASE_PKGS="base-devel ccache git gsfonts tk wget gcc"
SITL_PKGS="python-pip python-setuptools python-wheel python-wxpython opencv python-numpy python-scipy" SITL_PKGS="python-pip python-setuptools python-wheel python-wxpython opencv python-numpy python-scipy"
PX4_PKGS="lib32-glibc zip zlib ncurses" PX4_PKGS="lib32-glibc zip zlib ncurses"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect argparse matplotlib pyparsing geocoder pyserial empy==3.3.4 dronecan setuptools wheel" PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect argparse matplotlib pyparsing geocoder pyserial empy==3.3.4 dronecan packaging setuptools wheel"
# GNU Tools for ARM Embedded Processors # GNU Tools for ARM Embedded Processors
# (see https://launchpad.net/gcc-arm-embedded/) # (see https://launchpad.net/gcc-arm-embedded/)

2
Tools/environment_install/install-prereqs-openSUSE-Tumbleweed.sh
View File

@ -105,7 +105,7 @@ if ! grep -Fxq "$SOURCE_LINE" ~/.bashrc; then
fi fi
fi fi
$PIP3 install -U pip setuptools wheel $PIP3 install -U pip packaging setuptools wheel
$PIP3 install -U attrdict3 $PIP3 install -U attrdict3
$PIP3 install -U $PYTHON_PKGS $PIP3 install -U $PYTHON_PKGS

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

@ -399,8 +399,8 @@ if [ -n "$PYTHON_VENV_PACKAGE" ]; then
fi fi
fi fi
# try update setuptools and wheel before installing pip package that may need compilation # try update packaging, 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 packaging setuptools wheel
if [ "$GITHUB_ACTIONS" == "true" ]; then if [ "$GITHUB_ACTIONS" == "true" ]; then
PIP_USER_ARGUMENT+=" --progress-bar off" PIP_USER_ARGUMENT+=" --progress-bar off"