Skip to content

[3.13] GH-121970: Extract pydoc_topics into a new extension (#129116) #130441

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 4 commits into from
Feb 27, 2025

Conversation

AA-Turner
Copy link
Member

@AA-Turner AA-Turner commented Feb 22, 2025

(cherry picked from commit 01bcf13)


📚 Documentation preview 📚: https://cpython-previews--130441.org.readthedocs.build/

AA-Turner and others added 3 commits February 22, 2025 02:02
…pythonGH-129116)

(cherry picked from commit 01bcf13)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
@AA-Turner AA-Turner changed the title GH-121970: Extract pydoc_topics into a new extension (#129116) [3.13] GH-121970: Extract pydoc_topics into a new extension (#129116) Feb 22, 2025
@AA-Turner AA-Turner requested review from hugovk and Yhg1s February 22, 2025 02:09
# Conflicts:
#	Doc/tools/extensions/pyspecific.py
@hugovk
Copy link
Member

hugovk commented Feb 22, 2025

Re: #130014 (comment)

Will this also introduce the lint failure during the next release?

@AA-Turner
Copy link
Member Author

Will this also introduce the lint failure during the next release?

I still haven't managed to reproduce the error (note this PR is fine). Local tests with the offending doctest line also seem fine.

@hugovk
Copy link
Member

hugovk commented Feb 22, 2025

I can reproduce on main with:

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

It adds a trailing space on line 5617.

The release process does this, but the regular CI doesn't, so PRs will pass.

@AA-Turner
Copy link
Member Author

AA-Turner commented Feb 22, 2025

This is very odd. I thought it might be my IDE stripping line endings, so I ran the following from a powershell terminal with my IDE closed:

PS> cd Doc
PS> python -m sphinx build -M pydoc-topics . build -aETW
PS> Move-Item build/pydoc-topics/topics.py ../Lib/pydoc_data/topics.py -Force
PS> git commit -am pydoc-topics

A few changes, but nothing on 5617... I will attempt to try via WSL...

Edit: Same result via WSL...

$ cd Doc
$ make clean venv pydoc-topics
$ cp build/pydoc-topics/topics.py ../Lib/pydoc_data/topics.py
$ git commit -am tmp

@AA-Turner
Copy link
Member Author

#130492 has now been merged, I'll apply the backport labels to it when these PRs are merged.

@AA-Turner AA-Turner merged commit 93b2bcb into python:3.13 Feb 27, 2025
39 checks passed
@AA-Turner AA-Turner deleted the backport-01bcf13-3.13 branch February 27, 2025 14:19
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.

2 participants