GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-108303: Move `.whl` test files to `Lib/test/whldata/` by sobolevn · Pull Request #114343 · python/cpython

Conversation

@sobolevn

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

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member
  • Issue: Move test files into test subdirectories #108303

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@sobolevn
pythongh-108303: Move .whl test files to Lib/test/whldata/
66e3ecc
@sobolevn
sobolevn requested a review from vstinner January 20, 2024 11:42
@bedevere-app bedevere-app Bot added the awaiting review label Jan 20, 2024
@bedevere-app bedevere-app Bot mentioned this pull request Jan 20, 2024
Move test files into test subdirectories #108303
Closed
@sobolevn sobolevn added skip news needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jan 20, 2024
AA-Turner
AA-Turner approved these changes Jan 20, 2024
View reviewed changes
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting review labels Jan 20, 2024
@vstinner

vstinner commented Jan 22, 2024

Copy link
Copy Markdown
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.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@sobolevn
Rename to wheeldata/
aa76125
@sobolevn

sobolevn commented Jan 23, 2024

Copy link
Copy Markdown
Member Author

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

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
vstinner
vstinner reviewed Jan 23, 2024
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

There was a problem hiding this 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...

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@sobolevn
Add it to Makefile
6618982
@vstinner
vstinner merged commit ba253a4 into python:main Jan 23, 2024
@miss-islington-app

miss-islington-app Bot commented Jan 23, 2024

Copy link
Copy Markdown

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!
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the awaiting merge label Jan 23, 2024
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

miss-islington-app Bot commented Jan 23, 2024

Copy link
Copy Markdown

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
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@miss-islington-app miss-islington-app Bot assigned vstinner Jan 23, 2024
@bedevere-app

bedevere-app Bot commented Jan 23, 2024

Copy link
Copy Markdown

GH-114488 is a backport of this pull request to the 3.12 branch.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Jan 23, 2024
@vstinner

vstinner commented Jan 23, 2024

Copy link
Copy Markdown
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?
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@sobolevn

sobolevn commented Jan 23, 2024

Copy link
Copy Markdown
Member Author

Yes, I will! Thanks for the catch.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
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

sobolevn commented Jan 23, 2024

Copy link
Copy Markdown
Member Author

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

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@vstinner

vstinner commented Jan 23, 2024

Copy link
Copy Markdown
Member

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

Ok, fine. Thanks for checking.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
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)
@ZeroIntensity ZeroIntensity removed the needs backport to 3.11 only security fixes label Feb 17, 2025
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

Uh oh!

There was an error while loading. Please reload this page.

Assignees

@vstinner vstinner

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@sobolevn @vstinner @AA-Turner @ZeroIntensity
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.