Skip to content

DOC: Pin max version of Sphinx#11724

Merged
saimn merged 1 commit intoastropy:mainfrom
pllim:fix-doc-pin-sphinx
May 10, 2021
Merged

DOC: Pin max version of Sphinx#11724
saimn merged 1 commit intoastropy:mainfrom
pllim:fix-doc-pin-sphinx

Conversation

@pllim
Copy link
Member

@pllim pllim commented May 10, 2021

New Sphinx release today appears to have broken our doc build over at RTD, which I reported upstream at sphinx-doc/sphinx#9210 . This PR is to temporarily pin max version of Sphinx until we figure out how to fix the failure permanently.

until we figure out how to fix the failure permanently.

[ci skip]
@pllim pllim added this to the v5.0 milestone May 10, 2021
@pllim pllim requested a review from saimn May 10, 2021 19:34
@saimn saimn merged commit 642d8ae into astropy:main May 10, 2021
@pllim pllim deleted the fix-doc-pin-sphinx branch May 10, 2021 19:50
pllim added a commit to pllim/astropy that referenced this pull request May 12, 2021
@pllim pllim modified the milestones: v5.0, v4.0.6 May 28, 2021
@pllim
Copy link
Member Author

pllim commented May 28, 2021

@meeseeksdev backport to v4.3.x

@meeseeksdev backport to v4.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented May 28, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v4.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 642d8aea136d274a82928a8735cd25d6905116ed
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #11724: DOC: Pin max version of Sphinx'
  1. Push to a named branch :
git push YOURFORK v4.0.x:auto-backport-of-pr-11724-on-v4.0.x
  1. Create a PR against branch v4.0.x, I would have named this PR:

"Backport PR #11724 on branch v4.0.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

pllim added a commit that referenced this pull request May 28, 2021
because upstream fix not available and not having this will block RTD builds and backport bot unable to auto-backport
@pllim
Copy link
Member Author

pllim commented May 28, 2021

Backport updates:

This should at least temporarily fix the associated RTD failure that would block subsequent backports.

p.s. 4.0.x seems to be broken by other things too...

eteq added a commit that referenced this pull request Jun 11, 2021
…724-on-v4.3.x

Backport PR #11724 on branch v4.3.x (DOC: Pin max version of Sphinx)
@astrofrog astrofrog removed this from the v4.0.6 milestone Aug 16, 2021
@astrofrog astrofrog modified the milestones: v4.3, v4.0.6 Aug 16, 2021
@astrofrog
Copy link
Member

Because of the custom commit message on v4.0.x the consistency scripts don't pick it up so I'll mark this as a manual backport.

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