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

gh-108303: Fix and move badsyntax_pep3120.py #109513

Merged
merged 4 commits into from
Sep 18, 2023
Merged

gh-108303: Fix and move badsyntax_pep3120.py #109513

merged 4 commits into from
Sep 18, 2023

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Sep 17, 2023 •
edited by bedevere-app bot
Loading

When creating tokenizedata/ I've missed this file. Fixing this now.

Also:

  • Fixed paths in .ruff.toml, because I moved some files
  • Remove misleading comment about VCS, because it is not marked as binary in .gitattributes

@bedevere-app bedevere-app bot mentioned this pull request Sep 17, 2023
Closed
AlexWaygood
AlexWaygood reviewed Sep 17, 2023
View reviewed changes
Lib/test/.ruff.toml Outdated Show resolved Hide resolved
Lib/test/.ruff.toml Outdated Show resolved Hide resolved
AlexWaygood
AlexWaygood previously approved these changes Sep 17, 2023
View reviewed changes
@AlexWaygood AlexWaygood dismissed their stale review September 17, 2023 10:50

Reviewed too soon, let's find consensus on the ruff config

AlexWaygood
AlexWaygood reviewed Sep 17, 2023
View reviewed changes
Lib/test/.ruff.toml Outdated Show resolved Hide resolved
@sobolevn @AlexWaygood
Update Lib/test/.ruff.toml
3986284 
Co-authored-by: Alex Waygood <[email protected]>
AlexWaygood
AlexWaygood approved these changes Sep 17, 2023
View reviewed changes
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.

Thanks!

hugovk
hugovk approved these changes Sep 17, 2023
View reviewed changes
Copy link
Member

@hugovk hugovk left a comment

Choose a reason for hiding this comment

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

Thank you!

@hugovk hugovk mentioned this pull request Sep 17, 2023
Closed
vstinner
vstinner approved these changes Sep 18, 2023
View reviewed changes
Copy link
Member

@vstinner vstinner 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 AlexWaygood merged commit 4dd47c6 into python:main Sep 18, 2023
17 checks passed
@vstinner
Copy link
Member

@AlexWaygood AlexWaygood merged commit 4dd47c6

Oh! I was merged this PR while you merged it :-)

@AlexWaygood
Copy link
Member

@AlexWaygood AlexWaygood merged commit 4dd47c6

Oh! I was merged this PR while you merged it :-)

Too slow ;-)

@vstinner
Copy link
Member

Too slow ;-)

Working in the train today, Internet is not great :-(

@vstinner vstinner added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Sep 21, 2023
@miss-islington
Copy link
Contributor

Thanks @sobolevn for the PR, and @AlexWaygood for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

Thanks @sobolevn for the PR, and @AlexWaygood for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

Sorry, @sobolevn and @AlexWaygood, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4dd47c63a97b3c39cd964ad12431fcdaf76dc823 3.12

@miss-islington
Copy link
Contributor

Sorry, @sobolevn and @AlexWaygood, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4dd47c63a97b3c39cd964ad12431fcdaf76dc823 3.11

@vstinner
Copy link
Member

Oh, backport this change needs to wait until PR #109314 is backported to 3.11 and 3.12.

sobolevn added a commit to sobolevn/cpython that referenced this pull request Sep 22, 2023
@sobolevn
[3.11] pythongh-108303: Fix and move badsyntax_pep3120.py (pythonGH…
b248118 
…-109513)

Co-authored-by: Alex Waygood <[email protected]>.
(cherry picked from commit 4dd47c6)

Co-authored-by: Nikita Sobolev <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Sep 22, 2023

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

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Sep 22, 2023
@AlexWaygood AlexWaygood removed their assignment Sep 22, 2023
vstinner pushed a commit that referenced this pull request Sep 22, 2023
@sobolevn
[3.11] gh-108303: Fix and move badsyntax_pep3120.py (GH-109513) (#1…
6bb18bb 
…09724)

* [3.11] gh-108303: Fix and move `badsyntax_pep3120.py` (GH-109513)

Co-authored-by: Alex Waygood <[email protected]>.
(cherry picked from commit 4dd47c6)

Backport to 3.11: update also test_imp.

Co-authored-by: Nikita Sobolev <[email protected]>
csm10495 pushed a commit to csm10495/cpython that referenced this pull request Sep 28, 2023
@sobolevn @AlexWaygood @csm10495
pythongh-108303: Fix and move badsyntax_pep3120.py (python#109513)
3394750 
Co-authored-by: Alex Waygood <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

@hugovk hugovk hugovk approved these changes

@AlexWaygood AlexWaygood AlexWaygood approved these changes

Assignees
No one assigned
Labels
needs backport to 3.12 bug and security fixes skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sobolevn @vstinner @AlexWaygood @miss-islington @hugovk