Skip to content

Remove trailing whitespace in Lib/pydoc_data/topics.py #130014

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

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

colesbury
Copy link
Contributor

No description provided.

@colesbury colesbury requested review from ambv and hugovk February 11, 2025 20:02
@colesbury colesbury marked this pull request as ready for review February 11, 2025 20:02
@colesbury
Copy link
Contributor Author

@colesbury colesbury enabled auto-merge (squash) February 11, 2025 20:06
@hugovk hugovk disabled auto-merge February 11, 2025 20:09
@hugovk
Copy link
Member

hugovk commented Feb 11, 2025

I disabled automerge because this was from the release: 3ae9101

The file is generated by:

cd Doc
make clean venv pydoc-topics
cp build/pydoc-topics/topics.py ../Lib/pydoc_data/topics.py

So let's also find and fix the root cause (if it doesn't take too long) or it'll come back.

@hugovk
Copy link
Member

hugovk commented Feb 11, 2025

From:

>>> for num in range(5,12): #doctest: +NORMALIZE_WHITESPACE

That line last changed 15 years ago: 4050792

So perhaps some tooling change, @AA-Turner?

@hugovk
Copy link
Member

hugovk commented Feb 11, 2025

Bisects to #129116:

01bcf13a1c5bfca5124cf2e0679c9d1b25b04708 is the first bad commit
commit 01bcf13a1c5bfca5124cf2e0679c9d1b25b04708 (HEAD)
Date:   Tue Jan 21 23:28:32 2025 +0000

    GH-121970: Extract ``pydoc_topics`` into a new extension (#129116)

 Doc/conf.py                          |     1 +
 Doc/tools/extensions/pydoc_topics.py |   187 +
 Doc/tools/extensions/pyspecific.py   |    72 +-
 Lib/pydoc_data/topics.py             | 30264 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
 4 files changed, 12969 insertions(+), 17555 deletions(-)
 create mode 100644 Doc/tools/extensions/pydoc_topics.py

@AA-Turner
Copy link
Member

Thanks for the bisection, I'll have a look.

A

@hugovk
Copy link
Member

hugovk commented Feb 11, 2025

Thanks! And that PR contained:

The 'formatstrings' change is trailing whitespace on the >>> for num in range(5,12): line:

:)

It might take a bit of time to sort that out, so let's just merge this to get the CI back to green. We have another month before the next release.

@hugovk hugovk merged commit ed816f1 into python:main Feb 11, 2025
48 checks passed
@AA-Turner
Copy link
Member

The line in string.rst is >>> for num in range(5,12): #doctest: +NORMALIZE_WHITESPACE, I imagine it will be improper stripping of the doctest flag.

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.

3 participants