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 23.1 #11916

Merged
merged 8 commits into from
Apr 3, 2023
Merged

Vendoring updates for 23.1 #11916

merged 8 commits into from
Apr 3, 2023

Conversation

pfmoore
Copy link
Member

@pfmoore pfmoore commented Apr 2, 2023

Skips pygments, tenacity and setuptools, as they all need updates to the patches. @pradyunsg can you take a look please?

@pfmoore
Copy link
Member Author

pfmoore commented Apr 2, 2023

It's not going to be my day, I can see. If the "Create RAMDisk" step is failing, I refuse to believe that's my fault. I'll let all the other checks run, and then try re-running the failed one in case the issue is intermittent, rather than a problem with the Windows worker.

@pradyunsg
Copy link
Member

I think Github changed something about the environment that broke RAM disks for us (again).

@sbidoul
Copy link
Member

sbidoul commented Apr 2, 2023

I've seen these RAM disk errors more frequently recently. Usually restarting the failed jobs is sufficient, which I just did here.

@pfmoore
Copy link
Member Author

pfmoore commented Apr 2, 2023

I sorted out the setuptools patch (I think) so I added that.

@pfmoore
Copy link
Member Author

pfmoore commented Apr 2, 2023

... and tenacity.

@pradyunsg All I did was:

  1. Try to do the revendor. That leaves a bunch of uncommitted stuff in my working directory.
  2. Manually review the patch and edit it to match the changed source. This involved editing the surrounding text that no longer matched, and/or changing line numbers in the header.
  3. Save the change to the patch file and revert everything else that was changed by the vendoring run.
  4. Cross fingers and re-run the vendoring.

Is that basically correct? I really don't like manually editing patch files, but given all of the changes in the working copy, editing the file and doing git diff wasn't an option as far as I could see...

@pfmoore
Copy link
Member Author

pfmoore commented Apr 2, 2023

... and that's pygments done. So I think I now have all of the vendoring done for 23.1, assuming nothing else changes before the release.

@@ -1 +1 @@
Update pkg_resources (via setuptools) to 65.6.3
Upgrade setuptools to 67.6.1
Copy link
Member

Choose a reason for hiding this comment

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

Is this change intentional? ("Update pkg_resources (via setuptools)" becoming "Upgrade setuptools")

Copy link
Member

Choose a reason for hiding this comment

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

I think it's a consequence of the automation handling things slightly differently than the manual upgrade I'd done earlier!

Copy link
Member Author

Choose a reason for hiding this comment

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

That's what I assume - I certainly didn't do anything explicit to cause this to happen.

Copy link
Member

@sbidoul sbidoul left a comment

Choose a reason for hiding this comment

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

LGTM

@pfmoore pfmoore merged commit 81f6a9f into pypa:main Apr 3, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 21, 2023
@pfmoore pfmoore deleted the vendoring-updates branch April 26, 2023 11:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants