Skip to content

gh-145098: Use macos-26-intel instead of macos-15-intel#149991

Merged
hugovk merged 2 commits into
python:mainfrom
hugovk:3.16-macos-26-intel
May 19, 2026
Merged

gh-145098: Use macos-26-intel instead of macos-15-intel#149991
hugovk merged 2 commits into
python:mainfrom
hugovk:3.16-macos-26-intel

Conversation

@hugovk

@hugovk hugovk commented May 18, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

@bedevere-app bedevere-app Bot mentioned this pull request May 18, 2026
Open
This was referenced May 18, 2026
Merged
Open
@hugovk

hugovk commented May 18, 2026

Copy link
Copy Markdown
Member Author

We first need to skip the tkinter timout on macOS 26 Intel:

@hugovk hugovk marked this pull request as ready for review May 19, 2026 04:40
@hugovk hugovk merged commit 517d3d2 into python:main May 19, 2026
59 checks passed
@hugovk hugovk deleted the 3.16-macos-26-intel branch May 19, 2026 04:41
@hugovk

hugovk commented May 19, 2026

Copy link
Copy Markdown
Member Author

Let's run this in main for a little before backporting.

Will also need the tkinter timeout backporting, or wait for Ned to look into fixing it after PyCon US.

@hugovk

hugovk commented Jul 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

It's been a few months, let's backport. Will try without the tkinter test skip at first, but will also backport that if needed.

@hugovk hugovk added the needs backport to 3.15 pre-release feature fixes, bugs and security fixes label Jul 6, 2026
@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.15.
🐍🍒⛏🤖

@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153179 is a backport of this pull request to the 3.15 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.15 pre-release feature fixes, bugs and security fixes label Jul 6, 2026
@hugovk hugovk added the needs backport to 3.14 bugs and security fixes label Jul 6, 2026
@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153181 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Jul 6, 2026
hugovk added a commit that referenced this pull request Jul 6, 2026
@miss-islington @hugovk
[3.15] gh-145098: Use macos-26-intel instead of macos-15-intel (G…
52810f9 
…H-149991) (#153179)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
hugovk added a commit that referenced this pull request Jul 6, 2026
@miss-islington @hugovk
[3.14] gh-145098: Use macos-26-intel instead of macos-15-intel (G…
195b1de 
…H-149991) (#153181)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@hugovk hugovk added the needs backport to 3.13 bugs and security fixes label Jul 6, 2026
@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 517d3d2c10c7e6214d1785cf27f768809910e52c 3.13

@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153185 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Jul 6, 2026
@hugovk hugovk added 3.12 only security fixes needs backport to 3.12 only security fixes and removed 3.12 only security fixes labels Jul 6, 2026
@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 517d3d2c10c7e6214d1785cf27f768809910e52c 3.12

@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153186 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Jul 6, 2026
hugovk added a commit that referenced this pull request Jul 6, 2026
@hugovk
[3.12] gh-145098: Use macos-26-intel instead of macos-15-intel (G…
9ae4044 
…H-149991) (#153186)
hugovk added a commit that referenced this pull request Jul 6, 2026
@hugovk
[3.13] gh-145098: Use macos-26-intel instead of macos-15-intel (G…
4a25974 
…H-149991) (#153185)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpshead gpshead gpshead approved these changes
@ezio-melotti ezio-melotti Awaiting requested review from ezio-melotti ezio-melotti is a code owner
@AA-Turner AA-Turner Awaiting requested review from AA-Turner AA-Turner is a code owner
@webknjaz webknjaz Awaiting requested review from webknjaz webknjaz is a code owner

Assignees

@hugovk hugovk

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hugovk @gpshead