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 ann_module*.py files to typinganndata/ folder #108354

Merged
merged 1 commit into from
Aug 23, 2023
Merged

gh-108303: Move ann_module*.py files to typinganndata/ folder #108354

merged 1 commit into from
Aug 23, 2023

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Aug 23, 2023 •
edited
Loading

Couple of thoughts:

  1. This is an internal change for sure
  2. These files were bothering me for quite some time
  3. This can create merge conflicts that can be probably be solved automatically
  4. This should be backported so we have the same test structure

CC @vstinner

@bedevere-bot bedevere-bot mentioned this pull request Aug 22, 2023
Closed
@vstinner vstinner merged commit 3f61cf6 into python:main Aug 23, 2023
@vstinner
Copy link
Member

Merged, thanks.

@sobolevn sobolevn mentioned this pull request Sep 12, 2023
Merged
@vstinner vstinner added the needs backport to 3.12 bug and security fixes label Sep 21, 2023
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 21, 2023
@sobolevn @miss-islington
pythongh-108303: Move ann_module*.py files to typinganndata/ fold…
86a4f67 
…er (pythonGH-108354)

(cherry picked from commit 3f61cf6)

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

bedevere-app bot commented Sep 21, 2023

GH-109672 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 Sep 21, 2023
@vstinner vstinner added the needs backport to 3.11 only security fixes label Sep 21, 2023
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @sobolevn and @vstinner, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3f61cf646d0506baa0c0c2118f05110446519c62 3.11

vstinner pushed a commit to vstinner/cpython that referenced this pull request Sep 21, 2023
@sobolevn @vstinner
pythongh-108303: Move ann_module*.py files to typinganndata/ fold…
7ca3fc6 
…er (python#108354)

(cherry picked from commit 3f61cf6)
@bedevere-app
Copy link

bedevere-app bot commented Sep 21, 2023

GH-109673 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 21, 2023
vstinner added a commit that referenced this pull request Sep 21, 2023
@vstinner @sobolevn
[3.11] gh-108303: Move ann_module*.py files to typinganndata/ fol…
e59ee6c 
…der (#108354) (#109673)

gh-108303: Move `ann_module*.py` files to `typinganndata/` folder (#108354)

(cherry picked from commit 3f61cf6)

Co-authored-by: Nikita Sobolev <[email protected]>
Yhg1s pushed a commit that referenced this pull request Oct 2, 2023
@miss-islington @sobolevn
[3.12] gh-108303: Move ann_module*.py files to typinganndata/ fol…
b153cab 
…der (GH-108354) (#109672)

gh-108303: Move `ann_module*.py` files to `typinganndata/` folder (GH-108354)
(cherry picked from commit 3f61cf6)

Co-authored-by: Nikita Sobolev <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gvanrossum gvanrossum Awaiting requested review from gvanrossum

@Fidget-Spinner Fidget-Spinner Awaiting requested review from Fidget-Spinner

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

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

Assignees

@vstinner vstinner

Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sobolevn @vstinner @miss-islington @bedevere-bot