Skip to content

gh-105084: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set - #105056

Merged
pradyunsg merged 5 commits into
python:mainfrom
hroncok:testwheels
May 30, 2023
Merged

gh-105084: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set#105056
pradyunsg merged 5 commits into
python:mainfrom
hroncok:testwheels

Conversation

@hroncok

@hroncokhroncok commented May 29, 2023•
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

@hroncok

hroncok commented May 29, 2023

Copy link
Copy Markdown
ContributorAuthor

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

hroncok commented May 29, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

@hroncokhroncok changed the title Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if setgh-105056: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if setMay 29, 2023
@hroncok
hroncok marked this pull request as ready for review May 29, 2023 13:05
@hroncokhroncok changed the title gh-105056: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if setTests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if setMay 29, 2023
hroncok added a commit to hroncok/cpython that referenced this pull request May 29, 2023
@hroncok
00401: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHE…
28229d0
…EL_PKG_DIR') if set
Proposed upstream python#105056
@hroncokhroncok mentioned this pull request May 30, 2023
Closed
@hroncokhroncok changed the title Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if setgh-105084: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if setMay 30, 2023
@hroncok

hroncok commented May 30, 2023

Copy link
Copy Markdown
ContributorAuthor

I have created an issue to make the blurb happy.

lysnikolaou
lysnikolaou approved these changes May 30, 2023
View reviewed changes

@lysnikolaoulysnikolaou 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.

Looks good! Thanks @hroncok!

@hroncok

hroncok commented May 30, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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:mainMay 30, 2023
@hroncok
hroncok deleted the testwheels branch May 30, 2023 10:20
@pradyunsgpradyunsg added the needs backport to 3.12 only security fixes label May 30, 2023
@miss-islington

miss-islington commented May 30, 2023

Copy link
Copy Markdown
Contributor

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

@miss-islington

miss-islington commented May 30, 2023

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

hroncok commented May 30, 2023

Copy link
Copy Markdown
ContributorAuthor

Ah, #104798 would need to be backported first.

@hroncok

hroncok commented May 30, 2023

Copy link
Copy Markdown
ContributorAuthor

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

@hroncokhroncok mentioned this pull request May 30, 2023
Merged
hroncok added a commit to hroncok/cpython that referenced this pull request Jun 7, 2023
@hroncok
pythongh-105084: Tests: Use setuptools+wheel from sysconfig.get_confi…
4daf678
…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

bedevere-bot commented Jun 7, 2023

Copy link
Copy Markdown

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

@bedevere-botbedevere-bot removed the needs backport to 3.12 only security fixes label Jun 7, 2023
@hroncok

hroncok commented Jun 7, 2023

Copy link
Copy Markdown
ContributorAuthor

#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
@hroncok@hrnciar
00401: Tests: Use setuptools+wheel from sysconfig.get_config_var('WHE…
8c16df6
…EL_PKG_DIR') if set
Proposed upstream python#105056
lysnikolaou pushed a commit that referenced this pull request Jun 13, 2023
@hroncok
[3.12]gh-105084: Tests: Use setuptools+wheel from sysconfig.get_conf…
04b9168
…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)
@befelemebefeleme mentioned this pull request Apr 10, 2024
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pradyunsgpradyunsgpradyunsg approved these changes
@lysnikolaoulysnikolaoulysnikolaou approved these changes

Assignees

@pradyunsgpradyunsg

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@hroncok@miss-islington@bedevere-bot@pradyunsg@lysnikolaou