Skip to content

Commit

Permalink
Tools: install-prereqs-ubuntu.sh: fix script after setuptools==71.0.0…
Browse files Browse the repository at this point in the history
… release

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

As pypa/setuptools#4496 (comment) mentions:
> setuptools>=71.0 does not work with packaging<24.0, but will not upgrade it if packaging is already installed

Also relevant: pypa/setuptools#4496
  • Loading branch information
ben-xD committed Jul 22, 2024
1 parent 56773f0 commit c2cfee4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Tools/environment_install/install-prereqs-arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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
# (see https://launchpad.net/gcc-arm-embedded/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if ! grep -Fxq "$SOURCE_LINE" ~/.bashrc; then
fi
fi

$PIP3 install -U pip setuptools wheel
$PIP3 install -U pip packaging setuptools wheel
$PIP3 install -U attrdict3
$PIP3 install -U $PYTHON_PKGS

Expand Down
4 changes: 2 additions & 2 deletions Tools/environment_install/install-prereqs-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ if [ -n "$PYTHON_VENV_PACKAGE" ]; then
fi
fi

# try update setuptools and wheel before installing pip package that may need compilation
$PIP install $PIP_USER_ARGUMENT -U pip setuptools wheel
# try update packaging, setuptools and wheel before installing pip package that may need compilation
$PIP install $PIP_USER_ARGUMENT -U pip packaging setuptools wheel

if [ "$GITHUB_ACTIONS" == "true" ]; then
PIP_USER_ARGUMENT+=" --progress-bar off"
Expand Down

0 comments on commit c2cfee4

Please sign in to comment.