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

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

Merged
merged 1 commit into from
Jul 23, 2024

Conversation

ben-xD
Copy link
Contributor

@ben-xD ben-xD commented Jul 22, 2024

Explicitly upgrade to 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

… 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
@ben-xD ben-xD force-pushed the fix-prereq-ubuntu-setuptools branch from 56776d8 to c2cfee4 Compare July 22, 2024 12:11
Copy link
Contributor

@khancyr khancyr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just need to fix the install on focal

@peterbarker peterbarker merged commit 0a9a8d9 into ArduPilot:master Jul 23, 2024
14 of 15 checks passed
@peterbarker
Copy link
Contributor

I've merged this as it fixes the Jammy environment test.

We should follow up with a fix for Focal as Pierre suggests, but it is a separate problem

Thanks @ben-xD !

@rmackay9
Copy link
Contributor

I tried to include this in 4.5.6-beta1 but was unable to due to a merge conflict. If someone is keen on including this in 4.5 then a backport PR would be greatly appreciated!

@ben-xD
Copy link
Contributor Author

ben-xD commented Oct 10, 2024

@rmackay9, does that mean testing the changes and opening 1 PR for each of the branches:

  remotes/upstream/Copter-4.5                     9a755a82d7 Plane: version to 4.5.7-beta1
  remotes/upstream/Plane-4.5                      0523b2c7cf Plane: version to 4.5.7-beta1
  remotes/upstream/Rover-4.5                      7b5ef6df77 Plane: version to 4.5.7-beta1
  remotes/upstream/Sub-4.5                        cede211a7c CI: add navigator64 build
  remotes/upstream/Tracker-4.5                    22e8f1e84e Plane: version to 4.5.7-beta1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: merge conflict
Development

Successfully merging this pull request may close these issues.

4 participants