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-105084: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set #105056

Merged
merged 5 commits into from
May 30, 2023

Conversation

hroncok
Copy link
Contributor

@hroncok hroncok commented May 29, 2023

@hroncok
Copy link
Contributor Author

hroncok commented May 29, 2023

Open question: Should TEST_HOME_DIR be considered when the wheel is not found in WHEEL_PKG_DIR?

The current implementation assumes that when WHEEL_PKG_DIR is set, it contains wheels for setuptools and wheel, but it does not necessarily need to be so (some distributors might only have pip there).

@hroncok
Copy link
Contributor Author

hroncok commented May 29, 2023

I've tested -- it seem this approach works for Fedora.

@hroncok hroncok changed the title Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set gh-105056: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set May 29, 2023
@hroncok hroncok marked this pull request as ready for review May 29, 2023 13:05
@hroncok hroncok changed the title gh-105056: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set May 29, 2023
hroncok added a commit to hroncok/cpython that referenced this pull request May 29, 2023
@hroncok hroncok changed the title Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set gh-105084: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set May 30, 2023
@hroncok
Copy link
Contributor Author

hroncok commented May 30, 2023

I have created an issue to make the blurb happy.

Copy link
Member

@lysnikolaou lysnikolaou left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks @hroncok!

@hroncok
Copy link
Contributor Author

hroncok commented May 30, 2023

Thanks, folks. Could you please add a Python 3.12 label? This is tests-only, so I belive it may still go into 3.12.

@pradyunsg pradyunsg merged commit bd98b65 into python:main May 30, 2023
@hroncok hroncok deleted the testwheels branch May 30, 2023 10:20
@pradyunsg pradyunsg added the needs backport to 3.12 bug and security fixes label May 30, 2023
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @hroncok and @pradyunsg, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker bd98b65e974b7a1e086a51e7b55131582f7a0491 3.12

@hroncok
Copy link
Contributor Author

hroncok commented May 30, 2023

Ah, #104798 would need to be backported first.

@hroncok
Copy link
Contributor Author

hroncok commented May 30, 2023

I have a patch in Fedora that applies to 3.11.0b1 and can backport that one, but I guess I'll ask first.

hroncok added a commit to hroncok/cpython that referenced this pull request Jun 7, 2023
…g_var('WHEEL_PKG_DIR') if set (python#105056)

Includes part of the changes from afa759f,
to make this apply.

Co-Authored-By: Lysandros Nikolaou <lisandrosnik@gmail.com>

(cherry picked from commit bd98b65)
@bedevere-bot
Copy link

GH-105424 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jun 7, 2023
@hroncok
Copy link
Contributor Author

hroncok commented Jun 7, 2023

#105424 is a manual backport to 3.12 that includes only the relevant changes from #104798

hrnciar pushed a commit to fedora-python/cpython that referenced this pull request Jun 7, 2023
lysnikolaou pushed a commit that referenced this pull request Jun 13, 2023
…ig_var('WHEEL_PKG_DIR') if set (#105056) (#105424)

Includes part of the changes from afa759f,
to make this apply.

Co-Authored-By: Lysandros Nikolaou <lisandrosnik@gmail.com>

(cherry picked from commit bd98b65)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants