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

gh-98576: Fix types in dataclass.InitVar example #98577

Merged
merged 1 commit into from
Oct 31, 2022

Conversation

hauntsaninja
Copy link
Contributor

@hauntsaninja hauntsaninja commented Oct 23, 2022

@bedevere-bot bedevere-bot added awaiting review docs Documentation in the Doc dir skip news labels Oct 23, 2022
@hauntsaninja
Copy link
Contributor Author

cc @JelleZijlstra

@hauntsaninja hauntsaninja added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Oct 23, 2022
Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

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

LGTM

@AlexWaygood
Copy link
Member

@ericvsmith, are you okay with this change? :)

It brings the example in the dataclasses docs up to date with revisions to PEP 484 that were made in 2018, in python/peps@0630155

@ericvsmith ericvsmith merged commit 880bafc into python:main Oct 31, 2022
@miss-islington
Copy link
Contributor

Thanks @hauntsaninja for the PR, and @ericvsmith for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry @hauntsaninja and @ericvsmith, I had trouble checking out the 3.11 backport branch.
Please retry by removing and re-adding the "needs backport to 3.11" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 880bafc574bcd811dd7244f9a82056430b489996 3.11

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 31, 2022
(cherry picked from commit 880bafc)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
@bedevere-bot
Copy link

GH-98909 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 Oct 31, 2022
@ericvsmith
Copy link
Member

Looks good. Thanks!

Does someone want to look at the 3.11 merge conflict?

@AlexWaygood AlexWaygood added needs backport to 3.11 only security fixes and removed needs backport to 3.11 only security fixes labels Oct 31, 2022
@miss-islington
Copy link
Contributor

Thanks @hauntsaninja for the PR, and @ericvsmith for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 31, 2022
(cherry picked from commit 880bafc)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
@bedevere-bot
Copy link

GH-98910 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Oct 31, 2022
@AlexWaygood
Copy link
Member

Looks good. Thanks!

Does someone want to look at the 3.11 merge conflict?

There was no merge conflict; just some sort of race condition that meant that @miss-islington was unable to check out the 3.11 branch. She succeeded on the second attempt :)

@ericvsmith
Copy link
Member

Thanks!

miss-islington added a commit that referenced this pull request Oct 31, 2022
(cherry picked from commit 880bafc)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Oct 31, 2022
(cherry picked from commit 880bafc)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
@hauntsaninja hauntsaninja deleted the dataclass-typing branch October 31, 2022 17:16
@hauntsaninja
Copy link
Contributor Author

@AlexWaygood where did you see the missislington logs? If you link me, I could take a look at fixing it :-)

@JelleZijlstra
Copy link
Member

It's just the posted message I think. I recently improved the message in python/miss-islington@868b6ba; from there it may be possible to trace the code to figure out the actual bug.

This condition most frequently happens when trying to do multiple backports at once, like on this PR, which makes me think it may be a race condition where both backports try to use the same resource. However, I've also seen it happen on PRs that were backported only to a single branch.

@AlexWaygood
Copy link
Member

Yes — to be clear, I don't have solid confirmation that a race condition is to blame; that's just my suspicion, given that removing and re-adding the label almost always seems to work :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir skip news topic-typing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants