Skip to content

ci: Clean up Python 3.12 builds#27059

Merged
oscargus merged 1 commit intomatplotlib:mainfrom
QuLogic:py312-final
Oct 11, 2023
Merged

ci: Clean up Python 3.12 builds#27059
oscargus merged 1 commit intomatplotlib:mainfrom
QuLogic:py312-final

Conversation

@QuLogic
Copy link
Copy Markdown
Member

@QuLogic QuLogic commented Oct 11, 2023

PR summary

The final release is out, as are non-prerelease wheels, so we can drop those workarounds.

PR checklist

@QuLogic
ci: Clean up Python 3.12 builds
49dd3aa 
The final release is out, as are non-prerelease wheels, so we can drop
those workarounds.
@QuLogic QuLogic added Build CI: Run cibuildwheel Run wheel building tests on a PR labels Oct 11, 2023
@QuLogic QuLogic added this to the v3.8.1 milestone Oct 11, 2023
@oscargus oscargus merged commit 6501209 into matplotlib:main Oct 11, 2023
@lumberbot-app
Copy link
Copy Markdown

lumberbot-app bot commented Oct 11, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.8.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 6501209c3091898176b0a9179b32ad4edf9bf47e
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #27059: ci: Clean up Python 3.12 builds'
  1. Push to a named branch:
git push YOURFORK v3.8.x:auto-backport-of-pr-27059-on-v3.8.x
  1. Create a PR against branch v3.8.x, I would have named this PR:

"Backport PR #27059 on branch v3.8.x (ci: Clean up Python 3.12 builds)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@QuLogic QuLogic deleted the py312-final branch October 11, 2023 05:10
@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Oct 11, 2023

I think the backport conflict is probably just #27057 wasn't merged yet.

@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Oct 11, 2023

@meeseeksdev backport to v3.8.x

@lumberbot-app
Copy link
Copy Markdown

lumberbot-app bot commented Oct 11, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.8.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 6501209c3091898176b0a9179b32ad4edf9bf47e
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #27059: ci: Clean up Python 3.12 builds'
  1. Push to a named branch:
git push YOURFORK v3.8.x:auto-backport-of-pr-27059-on-v3.8.x
  1. Create a PR against branch v3.8.x, I would have named this PR:

"Backport PR #27059 on branch v3.8.x (ci: Clean up Python 3.12 builds)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Oct 11, 2023
@oscargus @QuLogic
Backport PR matplotlib#27059: ci: Clean up Python 3.12 builds
00d1f25
@QuLogic QuLogic mentioned this pull request Oct 11, 2023
Merged
1 task
oscargus added a commit that referenced this pull request Oct 11, 2023
@oscargus
Merge pull request #27060 from QuLogic/auto-backport-of-pr-27059-on-v…
b494446 
…3.8.x

Backport PR #27059: ci: Clean up Python 3.12 builds
@ksunden ksunden mentioned this pull request Nov 2, 2023
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ksunden ksunden ksunden approved these changes

Assignees

No one assigned

Labels

Build CI: Run cibuildwheel Run wheel building tests on a PR

Projects

None yet

Milestone

v3.8.1

Development

Successfully merging this pull request may close these issues.

3 participants

@QuLogic @ksunden @oscargus