Skip to content

Pin to sphinx<1.8; unremove sphinxext.mathmpl. #12109

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
Sep 13, 2018

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Sep 13, 2018

PR Summary

Temporary fix for #12108.

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

@anntzer anntzer added the Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. label Sep 13, 2018
@anntzer anntzer added this to the v3.0 milestone Sep 13, 2018
@ImportanceOfBeingErnest
Copy link
Member

There is also this PR about updating doc-requirements : #11667
Maybe it can be incoorporated here or at least receive new attention.

@timhoffm timhoffm merged commit 6ff5287 into matplotlib:master Sep 13, 2018
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Sep 13, 2018
@anntzer anntzer deleted the pinsphinx branch September 13, 2018 21:48
QuLogic added a commit that referenced this pull request Sep 14, 2018
…109-on-v3.0.x

Backport PR #12109 on branch v3.0.x (Pin to sphinx<1.8; unremove sphinxext.mathmpl.)
@dstansby
Copy link
Member

@meeseeksdev backport to v2.2.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 15, 2018

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 v2.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 6ff52873b5a40f198d43fe82027ec812ff26aac1
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12109: Pin to sphinx<1.8; unremove sphinxext.mathmpl.'
  1. Push to a named branch :
git push YOURFORK v2.2.x:auto-backport-of-pr-12109-on-v2.2.x
  1. Create a PR against branch v2.2.x, I would have named this PR:

"Backport PR #12109 on branch v2.2.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.

dstansby pushed a commit to dstansby/matplotlib that referenced this pull request Sep 15, 2018
tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Sep 15, 2018
In matplotlib#12110 only the pinning got backported, not adding mathmpl back
into conf.py
@tacaswell tacaswell mentioned this pull request Sep 16, 2018
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Oct 2, 2018
@QuLogic
Copy link
Member

QuLogic commented Oct 2, 2018

Backported to v2.2.3-doc as df955f4 (I accidentally pushed this one directly.)

@QuLogic QuLogic modified the milestones: v3.0, v2.2-doc Oct 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants