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

Update vendored packaging to 23.1 #3926

Merged
merged 3 commits into from May 19, 2023
Merged

Conversation

MetRonnie
Copy link
Contributor

@MetRonnie MetRonnie commented May 17, 2023

Summary of changes

Update vendored packaging to 23.1

Closes #3802

I updated the packaging version in the two vendored.txt files and then ran tox -e vendor. It seems it pulled in a bunch of changes to the other vendored packages' dist-info folders - I don't know if that is desired?

Pull Request Checklist

@jaraco
Copy link
Member

jaraco commented May 19, 2023

It seems it pulled in a bunch of changes to the other vendored packages' dist-info folders - I don't know if that is desired?

It didn't so much pull them as those are the changes as found in those packages. I notice that a lot of the changes are whitespace-only changes. Did you run the vendoring routine on Windows by chance? It's possible that pip generates the files with different line endings depending on the platform.

@jaraco
Copy link
Member

jaraco commented May 19, 2023

I do see that some of the jaraco.* dependencies are unpinned, so they're getting updated implicitly. That's probably fine.

I do think we should run the vendoring update with tox -e py311 vendor so as to not downgrade the .pyc files (always use latest stable Python).

@jaraco
Copy link
Member

jaraco commented May 19, 2023

I'm using macOS and I see that the RECORD files are getting written with CRLF (Windows newlines), so something must have changed in pip to generate those files with the less desirable form :(.

@jaraco
Copy link
Member

jaraco commented May 19, 2023

It looks like pip has been writing RECORD files with newline='' for some time now (https://github.com/pypa/pip/blob/f25f8fffbbd16fdb13a4f8977946afe9a3248453/src/pip/_internal/operations/install/wheel.py#L703), meaning "no translation takes place", and that's the setting recommended by the csv module. I'm yet unable to identify why the newlines have changed, especially since these files were generated as recently as Feb 2023.

@jaraco
Copy link
Member

jaraco commented May 19, 2023

In order to decouple the incidental changes and the intentional ones, I've rebased your change on top of a clean re-run of tox -e vendor on Python 3.11.

@jaraco jaraco merged commit e328031 into pypa:main May 19, 2023
18 checks passed
@MetRonnie
Copy link
Contributor Author

Thanks 👍

Did you run the vendoring routine on Windows by chance?

(No, was Linux)

@MetRonnie MetRonnie deleted the bump-packaging branch May 22, 2023 09:59
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.

[BUG] DistributionNotFound error for ==x!y.z.* dependency in editable-installed package
2 participants