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.

Sign up for GitHub

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

Jump to bottom

bpo-44479: Regenerate test_frozenmain.h and frozen_hello.h on Windows #26984

Merged
merged 3 commits into from
Jul 5, 2021
Merged

bpo-44479: Regenerate test_frozenmain.h and frozen_hello.h on Windows #26984

merged 3 commits into from
Jul 5, 2021

Conversation

zooba
Copy link
Member

@zooba zooba commented Jul 1, 2021 •
edited by bedevere-bot
Loading

@zooba zooba requested a review from a team as a code owner July 1, 2021 21:10
ammaraskar
ammaraskar approved these changes Jul 2, 2021
View reviewed changes
Copy link
Member

@ammaraskar ammaraskar left a comment

Choose a reason for hiding this comment

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

Looks good, ran into this problem with #26955, but after applying this the files regen properly on Windows.

@zooba
Copy link
Member Author

zooba commented Jul 5, 2021

@ammaraskar Thanks for the review!

@zooba zooba merged commit 1b133ab into python:main Jul 5, 2021
@miss-islington
Copy link
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry @zooba, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 1b133ab8412e4f6a53914212df7a7656f376256d 3.10

@zooba zooba deleted the bpo-44479 branch July 5, 2021 15:18
@miss-islington
Copy link
Contributor

Sorry, @zooba, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 1b133ab8412e4f6a53914212df7a7656f376256d 3.9

@zooba zooba added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jul 5, 2021
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry @zooba, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 1b133ab8412e4f6a53914212df7a7656f376256d 3.10

@zooba zooba added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jul 5, 2021
@miss-islington
Copy link
Contributor

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

@bedevere-bot
Copy link

GH-27034 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jul 5, 2021
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 5, 2021
@zooba @miss-islington
bpo-44479: Regenerate test_frozenmain.h and frozen_hello.h during bui…
80aabfa 
…ld on Windows (pythonGH-26984)

(cherry picked from commit 1b133ab)

Co-authored-by: Steve Dower <steve.dower@python.org>
zooba added a commit to zooba/cpython that referenced this pull request Jul 5, 2021
@zooba
bpo-44479: Regenerate test_frozenmain.h and frozen_hello.h during bui…
782a412 
…ld on Windows (pythonGH-26984)
@zooba zooba removed the needs backport to 3.9 only security fixes label Jul 5, 2021
zooba added a commit that referenced this pull request Jul 5, 2021
@zooba
bpo-44479: Regenerate test_frozenmain.h and frozen_hello.h during bui…
f3289a5 
…ld on Windows (GH-26984)
@Fidget-Spinner Fidget-Spinner mentioned this pull request Jul 6, 2021
Merged
@pablogsal pablogsal mentioned this pull request Jul 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ammaraskar ammaraskar ammaraskar approved these changes

Assignees

@zooba zooba

Labels
OS-windows skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zooba @miss-islington @bedevere-bot @ammaraskar @the-knights-who-say-ni