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.

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

gh-117711: Only check for 'test/wheeldata' when it's actually used #117712

Merged
merged 2 commits into from
Apr 11, 2024

Conversation

befeleme
Copy link
Contributor

@befeleme befeleme commented Apr 10, 2024

It's possible to build Python with option --with-wheel-pkg-dir pointing to a custom wheel directory. Don't include the directory in the test set if the wheels are used from a different location.
Currently testing the patch in Fedora Linux.

It's possible to build Python with option `--with-wheel-pkg-dir`
pointing to a custom wheel directory. Don't include the directory in the test
set if the wheels are used from a different location.
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! 👍

@vstinner vstinner merged commit d496387 into python:main Apr 11, 2024
34 checks passed
@vstinner
Copy link
Member

Merged, thanks for the fix.

@befeleme befeleme deleted the test_makefile branch April 11, 2024 09:42
@sobolevn
Copy link
Member

We usually backport changes to this test to 3.12

@sobolevn sobolevn added the needs backport to 3.12 bug and security fixes label Apr 11, 2024
@miss-islington-app
Copy link

Thanks @befeleme 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 Apr 11, 2024
…sed (pythonGH-117712)

It's possible to build Python with option `--with-wheel-pkg-dir`
pointing to a custom wheel directory. Don't include the directory in the test
set if the wheels are used from a different location.

(cherry picked from commit d496387)

Co-authored-by: Karolina Surma <33810531+befeleme@users.noreply.github.com>
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
@bedevere-app
Copy link

bedevere-app bot commented Apr 11, 2024

GH-117749 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 Apr 11, 2024
@vstinner
Copy link
Member

We usually backport changes to this test to 3.12

Oh, I didn't know that 3.12 was also affected: I confirm, a 3.12 fix is needed.

vstinner pushed a commit that referenced this pull request Apr 11, 2024
…used (GH-117712) (#117749)

gh-117711: Only check for 'test/wheeldata' when it's actually used (GH-117712)

It's possible to build Python with option `--with-wheel-pkg-dir`
pointing to a custom wheel directory. Don't include the directory in the test
set if the wheels are used from a different location.

(cherry picked from commit d496387)

Co-authored-by: Karolina Surma <33810531+befeleme@users.noreply.github.com>
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
…sed (python#117712)

It's possible to build Python with option `--with-wheel-pkg-dir`
pointing to a custom wheel directory. Don't include the directory in the test
set if the wheels are used from a different location.

Co-authored-by: Miro Hrončok <miro@hroncok.cz>
@stefanor
Copy link
Contributor

This MR assumes wheeldata is deleted when WHEEL_PKG_DIR is set. That is not the case in Debian builds. Filed #120418 (PR: #120419) to fix this.

@hroncok
Copy link
Contributor

hroncok commented Jun 12, 2024

Sorry about that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants