Skip to content

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

Merged
vstinner merged 2 commits into
python:mainfrom
befeleme:test_makefile
Apr 11, 2024
Merged

gh-117711: Only check for 'test/wheeldata' when it's actually used#117712
vstinner merged 2 commits into
python:mainfrom
befeleme:test_makefile

Conversation

@befeleme

@befelemebefeleme commented Apr 10, 2024

Copy link
Copy Markdown
Contributor

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.
Comment threadLib/test/test_tools/test_makefile.py
Co-authored-by: Miro Hrončok <miro@hroncok.cz>

@sobolevnsobolevn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks! 👍

@vstinner

Copy link
Copy Markdown
Member

Merged, thanks for the fix.

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

Copy link
Copy Markdown
Member

We usually backport changes to this test to 3.12

@sobolevnsobolevn added the needs backport to 3.12 only security fixes label Apr 11, 2024
@miss-islington-app

Copy link
Copy Markdown

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
Copy Markdown

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

Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Contributor

Sorry about that.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip newstestsTests in the Lib/test dir

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@befeleme@vstinner@sobolevn@stefanor@hroncok