GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — [3.13] GH-121970: Extract `pydoc_topics` into a new extension (#129116) by AA-Turner · Pull Request #130441 · python/cpython

Conversation

@AA-Turner

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

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

(cherry picked from commit 01bcf13)

  • Issue: Improve and reorganise pyspecific #121970

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

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
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 <[email protected]>
@bedevere-app bedevere-app Bot added the awaiting core review label Feb 22, 2025
@bedevere-app bedevere-app Bot mentioned this pull request Feb 22, 2025
Improve and reorganise pyspecific #121970
Open
@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
@bedevere-app bedevere-app Bot added the skip news label Feb 22, 2025
@bedevere-app bedevere-app Bot mentioned this pull request Feb 22, 2025
GH-121970: Extract pydoc_topics into a new extension #129116
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?
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@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.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@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.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@AA-Turner

AA-Turner commented Feb 22, 2025 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

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
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@AA-Turner AA-Turner mentioned this pull request Feb 24, 2025
Doc: Strip trailing whitespace in pydoc_topics #130492
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.
hugovk reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
hugovk
hugovk approved these changes Feb 27, 2025
View reviewed changes
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting core review labels Feb 27, 2025
@AA-Turner
AA-Turner merged commit 93b2bcb into python:3.13 Feb 27, 2025
@bedevere-app bedevere-app Bot removed the awaiting merge label 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

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@AA-Turner @hugovk
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.