Skip to content

Conversation

@bneradt
Copy link
Contributor

@bneradt bneradt commented Jun 23, 2021

The latest version of Sphinx, 4.0.2, fails to build our docs via the
make html target. The latest 3.x release, currently 3.5.4, builds our
docs fine. Pinning to 3.x.

This also makes a fix for an API change in which sphinx.locale no longer
has l_.

The latest version of Sphinx, 4.0.2, fails to build our docs via the
make html target. The latest 3.x release, currently 3.5.4, builds our
docs fine. Pinning to 3.x.

This also makes a fix for an API change in which sphinx.locale no longer
has `l_`.
@bneradt bneradt added this to the 9.0.2 milestone Jun 23, 2021
@bneradt bneradt requested a review from zwoop June 23, 2021 20:35
@bneradt bneradt self-assigned this Jun 23, 2021
@bryancall bryancall modified the milestones: 9.0.2, 9.0.3 Jun 24, 2021
Copy link
Contributor

@zwoop zwoop left a comment

Choose a reason for hiding this comment

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

What could go wrong ...

@bneradt
Copy link
Contributor Author

bneradt commented Jun 30, 2021

I noticed this got marked for the 9.1.x project, but this is not needed there (and probably would result in a merge conflict if tried). The following PR for 9.1.x/master has already been merged in for this change: #7940

I know this is a bit confusing, but this present PR (#7987) is a superset of that 9.1.x/master one (#7940), because the doc/ext/traffic-server.py file had to be updated in 9.0.x as well as the Sphinx pin, so a cherry-pick to 9.0.x of that latter PR would not have been sufficient. Thus this PR was filed separately.

In any case, this PR should not go to 9.1.x nor master. This is just for 9.0.x.

@zwoop zwoop merged commit 1e9fb86 into apache:9.0.x Jun 30, 2021
@bneradt bneradt deleted the 90x_prepare_for_shinx_3x branch March 29, 2023 19:39
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.

4 participants