Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
timhoffm merged 1 commit intomatplotlib:masterfromanntzer:pinsphinx
Sep 13, 2018

Conversation

anntzer
Copy link
Contributor

PR Summary

Temporary fix for#12108.

PR Checklist

  • Has Pytest style unit tests
  • Code isFlake 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

@anntzeranntzer added the Release criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. labelSep 13, 2018
@anntzeranntzer added this to thev3.0 milestoneSep 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.

@timhoffmtimhoffm merged commit6ff5287 intomatplotlib:masterSep 13, 2018
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull requestSep 13, 2018
@anntzeranntzer deleted the pinsphinx branchSeptember 13, 2018 21:48
QuLogic added a commit that referenced this pull requestSep 14, 2018
…109-on-v3.0.xBackport 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

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 tosuggest an improvement.

dstansby pushed a commit to dstansby/matplotlib that referenced this pull requestSep 15, 2018
tacaswell added a commit to tacaswell/matplotlib that referenced this pull requestSep 15, 2018
Inmatplotlib#12110 only the pinning got backported, not adding mathmpl backinto conf.py
@tacaswelltacaswell mentioned this pull requestSep 16, 2018
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull requestOct 2, 2018
@QuLogic
Copy link
Member

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

@QuLogicQuLogic modified the milestones:v3.0,v2.2-docOct 2, 2018
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@jklymakjklymakjklymak approved these changes

@timhoffmtimhoffmtimhoffm approved these changes

Assignees
No one assigned
Labels
Release criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Milestone
v2.2-doc
Development

Successfully merging this pull request may close these issues.

6 participants
@anntzer@ImportanceOfBeingErnest@dstansby@QuLogic@jklymak@timhoffm
[8]ページ先頭
©2009-2025 Movatter.jp