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: Move more typing related files to Lib/test/typinganndata #111825

Merged
merged 2 commits into from
Nov 8, 2023
Merged

gh-108303: Move more typing related files to Lib/test/typinganndata #111825

merged 2 commits into from
Nov 8, 2023

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Nov 7, 2023 •
edited by bedevere-app bot
Loading

@sobolevn sobolevn requested a review from vstinner November 7, 2023 16:43
@bedevere-app bedevere-app bot mentioned this pull request Nov 7, 2023
Closed
@sobolevn sobolevn added skip news needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Nov 7, 2023
@sobolevn
Copy link
Member Author

sobolevn commented Nov 7, 2023

I guess that Lib/test/test_type_aliases.py is not present on 3.11, I will do the backport manually.

@gvanrossum gvanrossum removed their request for review November 7, 2023 18:52
vstinner
vstinner approved these changes Nov 8, 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, but I cannot merge: this is now a merge conflict. Can you try to fix it @sobolevn?

@AlexWaygood AlexWaygood enabled auto-merge (squash) November 8, 2023 13:53
@AlexWaygood AlexWaygood merged commit 82e36db into python:main Nov 8, 2023
20 checks passed
@miss-islington-app
Copy link

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

@miss-islington-app
Copy link

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 82e36dba45b750ad4ed68735eb05bb939968a1fa 3.12

@miss-islington-app
Copy link

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 82e36dba45b750ad4ed68735eb05bb939968a1fa 3.11

@vstinner
Copy link
Member

vstinner commented Nov 8, 2023

@sobolevn: As usual, there are some issues to backport the change to 3.12. Can you try to backport it manually?

sobolevn added a commit to sobolevn/cpython that referenced this pull request Nov 8, 2023
@sobolevn
[3.12] pythongh-108303: Move more typing related files to Lib/test/ty…
1adde76 
…pinganndata(pythonGH-111825)
@bedevere-app
Copy link

bedevere-app bot commented Nov 8, 2023

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

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Nov 8, 2023
AlexWaygood pushed a commit that referenced this pull request Nov 8, 2023
@sobolevn
[3.12] gh-108303: Move more typing related files to Lib/test/typingan…
992c3f6 
…ndata (GH-111825) (#111859)

[3.12] gh-108303: Move more typing related files to Lib/test/typinganndata(GH-111825)
sobolevn added a commit to sobolevn/cpython that referenced this pull request Nov 8, 2023
@sobolevn
[3.11] pythongh-108303: Move more typing related files to Lib/test/ty…
e0df40a 
…pinganndata (pythonGH-111825)
@bedevere-app
Copy link

bedevere-app bot commented Nov 8, 2023

GH-111860 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 Nov 8, 2023
AlexWaygood pushed a commit that referenced this pull request Nov 8, 2023
@sobolevn
[3.11] gh-108303: Move more typing related files to Lib/test/typingan…
a60bbde 
…ndata (GH-111825) (#111860)
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
@sobolevn @AlexWaygood @aisk
pythongh-108303: Move more typing related files to `Lib/test/typing…
3225278 
…anndata` (python#111825)

Co-authored-by: Alex Waygood <[email protected]>
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@sobolevn @AlexWaygood @Glyphack
pythongh-108303: Move more typing related files to `Lib/test/typing…
de206fb 
…anndata` (python#111825)

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

@AlexWaygood AlexWaygood AlexWaygood approved these changes

@vstinner vstinner vstinner approved these changes

@JelleZijlstra JelleZijlstra Awaiting requested review from JelleZijlstra JelleZijlstra is a code owner

Assignees

@AlexWaygood AlexWaygood

Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sobolevn @vstinner @AlexWaygood