Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Pin Sphinx to 1.x #13805

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

Merged
merged 1 commit into from
Mar 31, 2019
Merged

Pin Sphinx to 1.x #13805

merged 1 commit into from
Mar 31, 2019

Conversation

timhoffm
Copy link
Member

PR Summary

As reported in #13591 the matplotlib style is not rendered correctly with sphinx 2.0.
See also e.g. https://matplotlib.org/devdocs/api/axes_api.html.

As a temporary containment (and in the prospect that 3.1 might be released soon), this pins sphinx to <2.0 to keep the docs correctly rendered.

In the long run, we need to adapt the matplotlib style.

@timhoffm timhoffm added this to the v3.1.0 milestone Mar 30, 2019
@timhoffm timhoffm added the Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. label Mar 30, 2019
@tacaswell tacaswell merged commit 0eef2d7 into matplotlib:master Mar 31, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Mar 31, 2019

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 v3.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 0eef2d7c4b9b0dd90f05cc4f4bf8fbc622cae562
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #13805: Pin Sphinx to 1.x'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-13805-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #13805 on branch v3.1.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.

tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Mar 31, 2019
BLD: Pin Sphinx to 1.x

Conflicts:
	requirements/doc/doc-requirements.txt
          - the v3.1 branch support sphinx < 1.8 and carries a bunch
            of known-bad version exclusions
timhoffm added a commit that referenced this pull request Mar 31, 2019
…-v3.1.x

Merge pull request #13805 from timhoffm/pin-sphinx-1.x
@timhoffm timhoffm deleted the pin-sphinx-1.x branch June 10, 2022 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants