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 bumps for 25.0 #13006

Closed
wants to merge 8 commits into from
Closed

Conversation

ichard26
Copy link
Member

Let's see if CI passes...

I removed the distlib patch as the changes have been upstreamed and cut in the latest release.

@ichard26
Copy link
Member Author

Whelp. I'll take another look at this tomorrow.

@notatallshaw
Copy link
Member

Doesn't look related to current CI issues but this might come up as you check: pypa/pyproject-hooks#206

@sbidoul
Copy link
Member

sbidoul commented Oct 13, 2024

CI issues seem linked to rich?

Also, given pypa/pyproject-hooks#206 (thanks for the heads up @notatallshaw) I'm reluctant to get the pyproject-hooks upgrade so close to the release.

@sbidoul sbidoul added this to the 24.3 milestone Oct 13, 2024
@sbidoul
Copy link
Member

sbidoul commented Oct 20, 2024

@ichard26 I have cherry-picked your commits for distlib and certify in #13033.

The rest I suggest to do early in the 25.0 cycle.

@sbidoul sbidoul changed the title Vendoring bumps for 24.3 Vendoring bumps for 25.0 Oct 20, 2024
@sbidoul sbidoul modified the milestones: 24.3, 25.0 Oct 20, 2024
@ichard26
Copy link
Member Author

Thanks @sbidoul for picking this up! I agree the rest can go in 25.0. I did talk to the Rich developers earlier, but frankly, I still don't understand why rich is blowing up CI...

@mgorny
Copy link
Contributor

mgorny commented Nov 9, 2024

I'm going to try bisecting rich into a more specific commit.

@mgorny
Copy link
Contributor

mgorny commented Nov 9, 2024

The cause is apparently Textualize/rich@2d7a94d

mgorny added a commit to mgorny/pip that referenced this pull request Nov 9, 2024
Explicitly override `rich.console.Console.on_broken_pipe()` to reraise
the original exception, to bring the behavior of rich 13.8.0+ in line
with older versions.  The new versions instead close output fds and exit
with error instead, which prevents pip's pipe handler from firing.
This is the minimal change needed to make pip's test suite pass after
upgrading vendored rich.

Bug pypa#13006
Bug pypa#13072
mgorny added a commit to mgorny/pip that referenced this pull request Nov 9, 2024
Explicitly override `rich.console.Console.on_broken_pipe()` to reraise
the original exception, to bring the behavior of rich 13.8.0+ in line
with older versions.  The new versions instead close output fds and exit
with error instead, which prevents pip's pipe handler from firing.
This is the minimal change needed to make pip's test suite pass after
upgrading vendored rich.

Bug pypa#13006
Bug pypa#13072
@notatallshaw
Copy link
Member

notatallshaw commented Nov 9, 2024

I've not looked at the errors, but if the tests are related to handeling broken pipes it does look like that would break pip's existing broken pipe handeling, which starts here: https://github.com/pypa/pip/blob/24.3.1/src/pip/_internal/utils/logging.py#L41 and bubbles up to here: https://github.com/pypa/pip/blob/24.3.1/src/pip/_internal/cli/base_command.py#L132. If that's the issue it looks like pip would want to add it's own on_broken_pipe method.

@notatallshaw
Copy link
Member

Oh @mgorny is much faster than me: #13073

mgorny added a commit to mgorny/pip that referenced this pull request Nov 9, 2024
Explicitly override `rich.console.Console.on_broken_pipe()` to reraise
the original exception, to bring the behavior of rich 13.8.0+ in line
with older versions.  The new versions instead close output fds and exit
with error instead, which prevents pip's pipe handler from firing.
This is the minimal change needed to make pip's test suite pass after
upgrading vendored rich.

Bug pypa#13006
Bug pypa#13072
mgorny added a commit to mgorny/pip that referenced this pull request Nov 9, 2024
Explicitly override `rich.console.Console.on_broken_pipe()` to reraise
the original exception, to bring the behavior of rich 13.8.0+ in line
with older versions.  The new versions instead close output fds and exit
with error instead, which prevents pip's pipe handler from firing.
This is the minimal change needed to make pip's test suite pass after
upgrading vendored rich.

Bug pypa#13006
Bug pypa#13072
@ichard26 ichard26 marked this pull request as draft November 10, 2024 01:27
@ichard26
Copy link
Member Author

It was easier to restart from scratch, please see PR #13074.

@ichard26 ichard26 closed this Nov 10, 2024
@ichard26 ichard26 removed this from the 25.0 milestone Nov 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants