◐ Shell
reader mode source ↗
Skip to content

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

Merged
AA-Turner merged 4 commits into
python:3.13from
AA-Turner:backport-01bcf13-3.13
Feb 27, 2025
Merged

[3.13] GH-121970: Extract pydoc_topics into a new extension (#129116)#130441
AA-Turner merged 4 commits into
python:3.13from
AA-Turner:backport-01bcf13-3.13

Conversation

@AA-Turner

@AA-Turner AA-Turner commented Feb 22, 2025 •
edited by github-actions Bot
Loading

Copy link
Copy Markdown
Member

(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
@AA-Turner
pythonGH-121970: Extract pydoc_topics into a new extension (pytho… …
d439c38 
…n#129116)

(cherry picked from commit 01bcf13)
@AA-Turner
Update pydoc_data/topics.py
abaad1f
@AA-Turner
[3.13] pythonGH-121970: Extract pydoc_topics into a new extension (… …
5169c01 
…pythonGH-129116)

(cherry picked from commit 01bcf13)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
@bedevere-app bedevere-app Bot mentioned this pull request Feb 22, 2025
Open
@AA-Turner AA-Turner changed the title GH-121970: Extract pydoc_topics into a new extension (#129116) Feb 22, 2025
@bedevere-app bedevere-app Bot mentioned this pull request Feb 22, 2025
Merged
@AA-Turner AA-Turner requested review from Yhg1s and hugovk February 22, 2025 02:09
@AA-Turner
Merge remote-tracking branch 'upstream/3.13' into backport-01bcf13-3.13 …
4a146b1 
# Conflicts:
#	Doc/tools/extensions/pyspecific.py
@hugovk

hugovk commented Feb 22, 2025

Copy link
Copy Markdown
Member

Re: #130014 (comment)

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

@AA-Turner

AA-Turner commented Feb 22, 2025

Copy link
Copy Markdown
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

hugovk commented Feb 22, 2025

Copy link
Copy Markdown
Member

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

AA-Turner commented Feb 22, 2025 •
edited
Loading

Copy link
Copy Markdown
Member Author

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 AA-Turner mentioned this pull request Feb 24, 2025
Merged
@AA-Turner

AA-Turner commented Feb 26, 2025

Copy link
Copy Markdown
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
@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

Reviewers

@hugovk hugovk hugovk approved these changes

@Yhg1s Yhg1s Awaiting requested review from Yhg1s

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@AA-Turner @hugovk