Skip to content

[3.7] bpo-35472: Allow sphinx 3.6.6 to build Python 3.7 documentation.#11192

Merged
JulienPalard merged 1 commit intopython:3.7from
JulienPalard:sphinx-366-for-python37
Dec 19, 2018
Merged

[3.7] bpo-35472: Allow sphinx 3.6.6 to build Python 3.7 documentation.#11192
JulienPalard merged 1 commit intopython:3.7from
JulienPalard:sphinx-366-for-python37

Conversation

@JulienPalard
Copy link
Member

@JulienPalard JulienPalard commented Dec 17, 2018

This is not a backport, nor a change I'm willing to do on master, this is intentionally only for the 3.7 branch, so requirements will look like this:

  • python 3.6 needs sphinx 1.2
  • python 3.7 needs sphinx 1.6.6
  • python 3.8 needs sphinx 1.7 (and will ultimately need sphinx 2 for colspan and rowspan)

https://bugs.python.org/issue35472

@asvetlov
Copy link
Contributor

Why so many commits are affected?

@terryjreedy
Copy link
Member

Apparently, Julien (correctly) branched off of 3.7 in his clone but left the base branch on github's PR form. That makes all differences between 3.7 and 3.8 part of the PR. When he changed the base branch to 3.7, those all went away.

Julien, how did you do that without closing and opening another PR? For me, the merge target on the files page is read-only.

Copy link
Contributor

@asvetlov asvetlov left a comment

Choose a reason for hiding this comment

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

LGTM

@gvanrossum gvanrossum removed their request for review December 17, 2018 15:51
@1st1 1st1 removed their request for review December 17, 2018 15:54
@JulienPalard
Copy link
Member Author

@terryjreedy Yes I had an issue (I was on very low bandwidth at the time, in a train), while opening the PR, the select box to change the base was unresponsive, so I opened the issue, and then was able to change it.

You can change the base by clicking the "Edit" button next to the title.

@JulienPalard
Copy link
Member Author

Should I tag the branch [3.7] even if it's not a backport?

@JulienPalard JulienPalard changed the title bpo-35472: Allow sphinx 3.6.6 to build Python 3.7 documentation. [3.7] bpo-35472: Allow sphinx 3.6.6 to build Python 3.7 documentation. Dec 18, 2018
@terryjreedy
Copy link
Member

I believe that if you deleted [3.7], the bedevere/maintenance-branch-pr-title would fail instead of passing, as now. You can try that if you want.

@JulienPalard JulienPalard merged commit a9ed8fc into python:3.7 Dec 19, 2018
@JulienPalard
Copy link
Member Author

@terryjreedy I did the other way around: I added the [3.7] because bedevere was complaining.

@JulienPalard JulienPalard deleted the sphinx-366-for-python37 branch December 19, 2018 10:15
ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Dec 23, 2018
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.

5 participants