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

Plane: backport support for Python 3.12 to 4.5 #27889

Merged
merged 3 commits into from
Sep 16, 2024

Conversation

jonhoo
Copy link

@jonhoo jonhoo commented Aug 21, 2024

Backport of #26889.

@jonhoo jonhoo force-pushed the plane-backport-26889 branch 2 times, most recently from e6a10d3 to e4fe5b4 Compare August 21, 2024 11:09
@jonhoo
Copy link
Author

jonhoo commented Aug 21, 2024

Apologies for the force pushes – my local Plane-4.5 was behind so wanted to make this apply cleanly before review.

@peterbarker
Copy link
Contributor

This is a single commit - was this really a single commit into master? That would be contrary to our usual standards as it's got a mavlink commit in there.

We need to know what else went into that mavlink branch as part of that new submodule reference. We might need to reference a new commit in there if we are uncomfortable with other stuff implied by that mavlink submodule update

@jonhoo
Copy link
Author

jonhoo commented Aug 21, 2024

The original PR was indeed three commits, though the commits that updated the individual subprojects weren't any more informative than "python 3.12 support":

@jonhoo
Copy link
Author

jonhoo commented Aug 21, 2024

The CI failure seems pretty weird (and maybe unrelated?):

ld: building fixups: pointer not aligned at __ZN12AP_FWVersion5fwverE+0x34 from /Users/runner/work/ardupilot/ardupilot/build/sitl/AntennaTracker/Tracker.cpp.47.o

@jonhoo
Copy link
Author

jonhoo commented Aug 21, 2024

Now, it is true that for the backport, this ends up picking up a few extra commits to mavlink, but a cursory look at them suggests they'd be okay to bring in here (i.e., not worth doing a cherry-pick):

ArduPilot/mavlink@1e04d8b...2825252d6d13eb347520f028b3c580ab29bd78e5^

@peterbarker
Copy link
Contributor

@jonhoo this is unlikely to be merged as a single commit.

Thanks for checking out the mavlink commits.

The CI failure happens at random on MacOSX. Fixed in #26700 - I've marked that for backporting.

@jonhoo jonhoo force-pushed the plane-backport-26889 branch from e4fe5b4 to d2e9e67 Compare August 22, 2024 09:02
@jonhoo
Copy link
Author

jonhoo commented Aug 22, 2024

Okay, I have now cherry-picked the individual commits instead.

@jonhoo
Copy link
Author

jonhoo commented Aug 22, 2024

Is it worth also backporting this to 4.3 and 4.4?

@rmackay9
Copy link
Contributor

Hi @jonhoo,

Thanks for this. I don't think it's worth creating a 4.3 or 4.4 backport because we don't plan to do any more releases for those version.

@rmackay9 rmackay9 merged commit 1e1d4a8 into ArduPilot:Plane-4.5 Sep 16, 2024
91 of 92 checks passed
@rmackay9
Copy link
Contributor

This is included in Copter-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: 4.5.7-beta1
Development

Successfully merging this pull request may close these issues.

5 participants