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 — Remove trailing whitespace in Lib/pydoc_data/topics.py by colesbury · Pull Request #130014 · python/cpython

Conversation

@colesbury

@colesbury colesbury commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

No description provided.

Sorry, something went wrong.

Uh oh!

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

All reactions
@colesbury
Fix lint error in Lib/pydoc_data/topics.py
f7787d5
@colesbury colesbury added skip issue skip news labels Feb 11, 2025
@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
@bedevere-app bedevere-app Bot added the awaiting core review label Feb 11, 2025
@colesbury

colesbury commented Feb 11, 2025

Copy link
Copy Markdown
Contributor Author

Fixes the lint failure on main:

https://github.com/python/cpython/actions/runs/13271298060/job/37051080688

All reactions

Sorry, something went wrong.

Uh oh!

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

hugovk
hugovk approved these changes Feb 11, 2025
View reviewed changes
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting core review labels Feb 11, 2025
@colesbury
colesbury enabled auto-merge (squash) February 11, 2025 20:06
@hugovk
hugovk disabled auto-merge February 11, 2025 20:09
@hugovk

hugovk commented Feb 11, 2025

Copy link
Copy Markdown
Member

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.

colesbury 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 commented Feb 11, 2025

Copy link
Copy Markdown
Member

From:

cpython/Doc/library/string.rst

Line 742 in 00ec781

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

That line last changed 15 years ago: 4050792

So perhaps some tooling change, @AA-Turner?

All reactions

Sorry, something went wrong.

Uh oh!

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

@hugovk

hugovk commented Feb 11, 2025

Copy link
Copy Markdown
Member

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

Sorry, something went wrong.

Uh oh!

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

@AA-Turner

AA-Turner commented Feb 11, 2025

Copy link
Copy Markdown
Member

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

A

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 commented Feb 11, 2025

Copy link
Copy Markdown
Member

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.

All reactions

Sorry, something went wrong.

Uh oh!

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

@hugovk
hugovk merged commit ed816f1 into python:main Feb 11, 2025
@bedevere-app bedevere-app Bot removed the awaiting merge label Feb 11, 2025
@AA-Turner

AA-Turner commented Feb 11, 2025

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

All reactions

Sorry, something went wrong.

Uh oh!

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

@hugovk hugovk mentioned this pull request Feb 12, 2025
gh-127833: Fix grammar snippet formatting for help() output #129692
Closed
@colesbury
colesbury deleted the lint branch February 14, 2025 18:18
@hugovk hugovk mentioned this pull request Feb 22, 2025
[3.13] GH-121970: Extract pydoc_topics into a new extension (#129116) #130441
Merged
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
@ambv ambv Awaiting requested review from ambv

Uh oh!

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

Assignees

No one assigned

Labels

skip issue 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.

3 participants

@colesbury @hugovk @AA-Turner
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.