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

Vendoring updates for 24.2 #12846

Merged
merged 5 commits into from
Jul 13, 2024
Merged

Vendoring updates for 24.2 #12846

merged 5 commits into from
Jul 13, 2024

Conversation

ichard26
Copy link
Member

Towards #12819. Closes #12833.

This is your PR but with the conflicts introduced by my tenacity removal PR fixed @pradyunsg.

On reflection, I do think I could've saved myself some work by simply interactive rebasing your branch to drop the tenacity bump, but I redid the vendoring upgrade from scratch instead, whoops :)

@ichard26
Copy link
Member Author

Oh hmm, setuptools is deprecating importing distutils from the standard library in 70.3.0 (god, this project frequently releases). pypa/setuptools@2832216

Is that going to be a concern for us?

@pradyunsg
Copy link
Member

That doesn't look concerning -- we only use pkg_resources from within setuptools and this does not affect us in-process. It might affect us out-of-process though but that's a "your backend changed, not pip" message.

@pradyunsg pradyunsg merged commit 3c51be8 into pypa:main Jul 13, 2024
29 checks passed
@ichard26 ichard26 deleted the vendoring-bumps-24.2 branch July 13, 2024 21:31
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants