Skip to content

Conversation

@sobolevn
Copy link
Member

@sobolevnsobolevn commented Nov 7, 2023

@sobolevn
Copy link
MemberAuthor

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

@gvanrossumgvanrossum removed their request for review November 7, 2023 18:52
Copy link
Member

@vstinnervstinner 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?

@AlexWaygoodAlexWaygood enabled auto-merge (squash) November 8, 2023 13:53
@AlexWaygoodAlexWaygood merged commit 82e36db into python:mainNov 8, 2023
@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

@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
@bedevere-app
Copy link

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

@bedevere-appbedevere-appbot removed the needs backport to 3.12 only security fixes label Nov 8, 2023
AlexWaygood pushed a commit that referenced this pull request Nov 8, 2023
…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
@bedevere-app
Copy link

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

@bedevere-appbedevere-appbot removed the needs backport to 3.11 only security fixes label Nov 8, 2023
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
…anndata` (python#111825) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
…anndata` (python#111825) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@sobolevn@vstinner@AlexWaygood