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 .whl test files to Lib/test/whldata/ #114343

Merged
merged 3 commits into from
Jan 23, 2024
Merged

gh-108303: Move .whl test files to Lib/test/whldata/ #114343

merged 3 commits into from
Jan 23, 2024

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Jan 20, 2024 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot mentioned this pull request Jan 20, 2024
Closed
@sobolevn sobolevn added skip news needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Jan 20, 2024
@vstinner
Copy link
Member

whldata can you rename it to wheeldata? Technically, it's seems like these 2 files are venv dependencies. Maybe venvdata? I don't know.

@sobolevn
Copy link
Member Author

I think that wheeldata sounds correct to hold .whl files 👍
While venvdata might be confusing.

vstinner
vstinner reviewed Jan 23, 2024
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.

Usually, when you add a new test directory, "Installed" buildbot fails :-) It seems like you didn't add the directory to the Makefile...

@vstinner vstinner merged commit ba253a4 into python:main Jan 23, 2024
27 checks passed
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 23, 2024
@sobolevn @miss-islington
pythongh-108303: Move .whl test files to Lib/test/wheeldata/ (pyt…
f87ca88 
…honGH-114343)

(cherry picked from commit ba253a4)

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

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 ba253a4794ae2d35a6f6df46a98a1ed38bd61268 3.11

@bedevere-app
Copy link

bedevere-app bot commented Jan 23, 2024

GH-114488 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 Jan 23, 2024
@vstinner
Copy link
Member

Aha, the classic TESTSUBDIRS trap. Good, it was catched before this time ;-)

Thanks, I merged your PR. The 3.12 backport is on-going, and 3.11 failed as usual :-(

@sobolevn: Do you want to try to backport manually the change to 3.11?

@sobolevn
Copy link
Member Author

Yes, I will! Thanks for the catch.

vstinner pushed a commit that referenced this pull request Jan 23, 2024
@miss-islington @sobolevn
[3.12] gh-108303: Move .whl test files to Lib/test/wheeldata/ (GH…
be85f35 
…-114343) (#114488)

gh-108303: Move `.whl` test files to `Lib/test/wheeldata/` (GH-114343)
(cherry picked from commit ba253a4)

Co-authored-by: Nikita Sobolev <[email protected]>
@sobolevn
Copy link
Member Author

There should be no 3.11 backport, since these changes were only made for 3.12+
See #103316

@vstinner
Copy link
Member

There should be no 3.11 backport, since these changes were only made for 3.12+

Ok, fine. Thanks for checking.

aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
@sobolevn @aisk
pythongh-108303: Move .whl test files to Lib/test/wheeldata/ (pyt…
7b6f54c 
…hon#114343)
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@sobolevn @Glyphack
pythongh-108303: Move .whl test files to Lib/test/wheeldata/ (pyt…
493d74e 
…hon#114343)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner left review comments

@AA-Turner AA-Turner AA-Turner approved these changes

Assignees

@vstinner vstinner

Labels
needs backport to 3.11 only security fixes skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sobolevn @vstinner @AA-Turner