Skip to content

/ cpython

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

Jump to bottom

bpo-42843: Keep Sphinx 1.8 and Sphinx 2 compatibility #24282

Merged
merged 4 commits into from Jan 25, 2021
Merged

bpo-42843: Keep Sphinx 1.8 and Sphinx 2 compatibility #24282

merged 4 commits into from Jan 25, 2021
+30 −48

Conversation

@JulienPalard
Copy link
Member

@JulienPalard JulienPalard commented Jan 21, 2021 •
edited by bedevere-bot

See also https://mail.python.org/archives/list/python-dev@python.org/message/W5QVYL5L4DMA2BR5J5NNWRJ2KDMRNGX7/

This keeps compatibility with Sphinx 2 (and Sphinx 1.8 as told by Doc/config.py.)

Closes #24142

https://bugs.python.org/issue42843
JulienPalard added 3 commits Jan 4, 2021
@JulienPalard
Revert "[doc] Fix erroneous backslashes in signatures and names (GH-2…
900251b 
…3658)" (GH-24093)

This partially reverts commit
02349e2, which was removing
backslashes in documentations compiled with Sphinx < 3, used for
Python 3.8 and 3.9 docs.
@JulienPalard
strip_signature_backslash
325e913
@JulienPalard
Revert "bpo-36675: Doc: Reveal doctest directives (GH-23620)"
Loading status checks…
882b942 
This reverts commit c8a10d2.
@JulienPalard JulienPalard requested review from 1st1, asvetlov and python/email-team as code owners Jan 21, 2021
@JulienPalard JulienPalard mentioned this pull request Jan 21, 2021
Closed
@JulienPalard
Was fixed then reverted, let's keep this space fixed.
Loading status checks…
3b3d347
@JulienPalard
Copy link
Member Author

@JulienPalard JulienPalard commented Jan 21, 2021

@mcepl @asottile Does it looks good to you?
@mcepl
Copy link
Contributor

@mcepl mcepl commented Jan 21, 2021

It does. Thank you.
@JulienPalard JulienPalard merged commit 5c1f15b into python:master Jan 25, 2021
11 checks passed
11 checks passed
Docs
Details
Check for source changes
Details
Check if generated files are up to date
Details
Windows (x86)
Details
Windows (x64)
Details
macOS
Details
Ubuntu
Details
Azure Pipelines PR #20210121.10 succeeded
Details
Travis CI - Pull Request Build Passed
Details
bedevere/issue-number Issue number 42843 found
Details
bedevere/news "skip news" label found
m000 added a commit to m000/cpython that referenced this pull request Jan 29, 2021
@JulienPalard @m000
bpo-42843: Keep Sphinx 1.8 and Sphinx 2 compatibility (pythonGH-24282)
cea326a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1st1 1st1

@asvetlov asvetlov

@python/email-team email-team

Assignees
No one assigned
Labels
CLA signed skip news
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@JulienPalard @mcepl @the-knights-who-say-ni @bedevere-bot