◐ Shell
reader mode source ↗
Skip to content

bpo-29520: Fix deprecation warning from 'defindex' template#165

Merged
methane merged 2 commits into
python:masterfrom
methane:support-new-sphinx
Feb 19, 2017
Merged

bpo-29520: Fix deprecation warning from 'defindex' template#165
methane merged 2 commits into
python:masterfrom
methane:support-new-sphinx

Conversation

@methane

@methane methane commented Feb 19, 2017

Copy link
Copy Markdown
Member

Confirmed with Sphinx 1.3.6 and 1.5.2
[bpo-29520]

@methane methane added docs Documentation in the Doc dir needs backport to 2.7 labels Feb 19, 2017
@methane methane mentioned this pull request Feb 19, 2017
Closed
@ncoghlan

ncoghlan commented Feb 19, 2017

Copy link
Copy Markdown
Contributor

I think the main advantage I see to @ultimatecoder's approach in #170 is that that doesn't require changing the minimum Sphinx version.

Perhaps it would make sense to go with this PR and the newer Sphinx requirement for 3.7+, while using the approach in #170 for the maintenance branches?

berkerpeksag
berkerpeksag approved these changes Feb 19, 2017
View reviewed changes

@berkerpeksag berkerpeksag 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.

Hide comment

FWIW, I prefer this over #170. defindex comes from the very early days of Sphinx (pre 1.0 IIRC) and it was kept for backward compatibility reasons over the years. Since it's easy to drop it I don't think we should maintain a copy of defindex.html in CPython codebase.

And since we use venv to build the docs it's easy to upgrade the Sphinx version installed.

@methane

methane commented Feb 19, 2017

Copy link
Copy Markdown
Member Author

@ncoghlan I update minimum version because no one test it.
I don't think this change require updating minimum version.

sphinx-doc/sphinx#2986 (comment)

It was used to keep compatibility to before Sphinx-0.2.

@methane

methane commented Feb 19, 2017

Copy link
Copy Markdown
Member Author

I confirmed sphinx 1.2.3 can build html without any warnings.
Should I revert 'minimum version'? (approval is required again)

@berkerpeksag

berkerpeksag commented Feb 19, 2017

Copy link
Copy Markdown
Member

That's great! Assuming you've also verified the HTML output of indexcontent.html, count me as +1 on keeping the minimum Sphinx version as 1.2.

Thanks.

@methane methane merged commit 3eea8c6 into python:master Feb 19, 2017
@methane methane deleted the support-new-sphinx branch February 19, 2017 17:07
This was referenced Feb 19, 2017
Merged
Merged
Merged
methane added a commit to methane/cpython that referenced this pull request Feb 20, 2017
@methane
bpo-29520: doc: fix deprecation warning from 'defindex' template (pyt… …
dbe3f9c 
…honGH-165)
methane added a commit to methane/cpython that referenced this pull request Feb 20, 2017
@methane
bpo-29520: doc: fix deprecation warning from 'defindex' template (pyt… …
76d0b43 
…honGH-165)
methane added a commit to methane/cpython that referenced this pull request Feb 20, 2017
@methane
bpo-29520: doc: fix deprecation warning from 'defindex' template (pyt… …
a8aedaf 
…honGH-165)
isidentical added a commit to isidentical/cpython that referenced this pull request Oct 25, 2021
@isidentical
allow multiline debug expresisons (python#165) …
81ed1ec 
* allow multiline debug expresisons

* check whether the bracket is top-level

* fix punctuation to top-level :

* inline f-string level check to callsites

* free fstring buffers at the end#

* fix leaked buffer on realloc#
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@berkerpeksag berkerpeksag berkerpeksag approved these changes

Assignees

No one assigned

Labels

docs Documentation in the Doc dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@methane @ncoghlan @berkerpeksag @Mariatta @the-knights-who-say-ni