FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-117928: Bump the minimum Sphinx version to 6.2.1 by Eclips4 · Pull Request #117853 · python/cpython · GitHub

/ cpython Public

gh-117928: Bump the minimum Sphinx version to 6.2.1 - #117853

Merged
hugovk merged 5 commits into
python:mainfrom
Eclips4:sphinx_oldest
Apr 26, 2024
Merged

gh-117928: Bump the minimum Sphinx version to 6.2.1#117853
hugovk merged 5 commits into
python:mainfrom
Eclips4:sphinx_oldest

Conversation

Eclips4 commented Apr 13, 2024
edited
Loading

Copy link
Copy Markdown
Member

Copy link
Copy Markdown
Contributor

Sphinx version error:
The sphinxcontrib.applehelp extension used by this project needs at least Sphinx v5.0; it therefore cannot be built with this version.

Eclips4 commented Apr 13, 2024

Copy link
Copy Markdown
Member Author

Sphinx version error:
The sphinxcontrib.applehelp extension used by this project needs at least Sphinx v5.0; it therefore cannot be built with this version.

Thanks for pointing this out.
@hugovk @AA-Turner Maybe it's time to switch to Sphinx 5.0?

hugovk commented Apr 13, 2024

Copy link
Copy Markdown
Member

Now that the 3.11 branch is only accepting security fixes, for 3.12+ I think we can bump the oldest supported Sphinx to at least 6.2.1.

Let's open a new issue to do a similar survey to #109209.

hugovk commented Apr 16, 2024

Copy link
Copy Markdown
Member

Survey: #117928

hugovk commented Apr 25, 2024

Copy link
Copy Markdown
Member

OK, according to #117928 we can upgrade to Sphinx 6.2.1 as the minimum for the 3.12 and main branches.

Would you like to update this PR? We can also use that issue number for this PR.

There's some compatibility code for old Sphinx we can remove from some files Doc/tools, and let's also rename master_doc in conf.py to root_doc (ref).

Eclips4 commented Apr 25, 2024

Copy link
Copy Markdown
Member Author

OK, according to #117928 we can upgrade to Sphinx 6.2.1 as the minimum for the 3.12 and main branches.

Would you like to update this PR? We can also use that issue number for this PR.

There's some compatibility code for old Sphinx we can remove from some files Doc/tools, and let's also rename master_doc in conf.py to root_doc (ref).

I'll update this PR as soon as possible ;)

Eclips4 changed the title Regen Doc/requirements-oldest-sphinx.txt gh-117928: Bump Sphinx version to 6.2.1 Apr 25, 2024
Eclips4 changed the title gh-117928: Bump Sphinx version to 6.2.1 gh-117928: Bump the minimum Sphinx version to 6.2.1 Apr 25, 2024

hugovk commented Apr 25, 2024

Copy link
Copy Markdown
Member

Thanks, let's also try using 3.12 in .github/workflows/reusable-docs.yml and put 6.2.1 in the comment:

        python-version: '3.11'  # known to work with Sphinx 4.2

Comment thread Doc/conf.py Outdated
AlexWaygood removed their request for review April 25, 2024 19:59
Eclips4 and others added 2 commits April 25, 2024 23:08
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Eclips4 requested a review from ezio-melotti as a code owner April 25, 2024 20:10

hugovk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Thanks!

hugovk merged commit 463c20d into python:main Apr 26, 2024

Copy link
Copy Markdown

Thanks @Eclips4 for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

Copy link
Copy Markdown

Sorry, @Eclips4 and @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 463c20dae9ac91d6c44028177b90f43238b819cf 3.12

hugovk commented Apr 26, 2024

Copy link
Copy Markdown
Member

@Eclips4 Please could you backport?

Eclips4 commented Apr 26, 2024

Copy link
Copy Markdown
Member Author

@Eclips4 Please could you backport?

Will do it today!

Eclips4 deleted the sphinx_oldest branch April 26, 2024 11:04

bedevere-app Bot commented Apr 26, 2024

Copy link
Copy Markdown

GH-118321 is a backport of this pull request to the 3.12 branch.

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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


Back | FazBrowse Home | New Git URL