Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
V32 mergeup#17285
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
Merged
V32 mergeup#17285
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
…t-of-pr-16835-on-v3.2.xBackport PRmatplotlib#16835 on branch v3.2.x (Don't forget to export isdeleted on Qt4.)
…t-of-pr-16851-on-v3.2.xBackport PRmatplotlib#16851 on branch v3.2.x (DOC: Fix docstring of Axes.secondary_yaxis.)
…t-of-pr-16867-on-v3.2.xBackport PRmatplotlib#16867 on branch v3.2.x (BLD: Auto-trigger macOS/Linux wheels on tags.)
Merge pull requestmatplotlib#16870 from timhoffm/xfailCI: Unbreak CI by xfailing wxAgg test on macOSConflicts: lib/matplotlib/tests/test_backends_interactive.py - Other improvements to messages when skipping tests frombc155f0 near by. Did not implicitly backport other changes.
…r-16870-on-v3.2.xBackport PRmatplotlib#16870: Unbreak CI by xfailing wxAgg test on macOS
…t-of-pr-16929-on-v3.2.xBackport PRmatplotlib#16929 on branch v3.2.x (tk: Resize the canvas, not the figure.)
…r boilerplate test.
…t-of-pr-16949-on-v3.2.xBackport PRmatplotlib#16949 on branch v3.2.x (TST: Don't modify actual pyplot file for boilerplate test.)
…t-of-pr-16966-on-v3.2.xBackport PRmatplotlib#16966 on branch v3.2.x (Fix animation writer fallback.)
…t-of-pr-16970-on-v3.2.xBackport PRmatplotlib#16970 on branch v3.2.x (tk: Don't resize toolbar during resize event.)
…t-of-pr-16940-on-v3.2.xBackport PRmatplotlib#16940 on branch v3.2.x (DOC/FIX: clarify the docs for check_figures_equal)
…in tight_bboxing renderer.
…t-of-pr-16980-on-v3.2.xBackport PRmatplotlib#16980 on branch v3.2.x (Correctly disable more drawing methods in tight_bboxing renderer.)
FIX: force blended transforms with data to be in data space
Merge pull requestmatplotlib#17017 from jklymak/fix-blended-transform
Merge pull requestmatplotlib#17045 from anntzer/docrefsFix missing-references.json.Conflicts:doc/missing-references.json - fixed by fully regenerating
…r-17045-on-v3.2.xBackport PRmatplotlib#17045: Fix missing-references.json.
…t-of-pr-17065-on-v3.2.xBackport PRmatplotlib#17065 on branch v3.2.x (Fix macOS CI test failure)
…t-of-pr-17126-on-v3.2.xBackport PRmatplotlib#17126 on branch v3.2.x (Remove Python2/3 info box)
…-17076-on-v3.2.xBackport PRmatplotlib#17076: Fix SyntaxErrors when running setup in old Python
…8-on-v3.2.xBackport PRmatplotlib#16958: MAINT: Replace uses of tostring with tobytes
…-17131-on-v3.2.xBackport PRmatplotlib#17131 on branch v3.2.x
…t-of-pr-17240-on-v3.2.xBackport PRmatplotlib#17240 on branch v3.2.x (CI: Download wx wheels for the correct Ubuntu version.)
…17206-on-v3.2.xMerge pull requestmatplotlib#17206 from jklymak/fix-bypass-inverse-collection
…') resets the backend
…t-of-pr-17252-on-v3.2.xBackport PRmatplotlib#17252 on branch v3.2.x (Fix bug where matplotlib.style('default') resets the backend)
Define \mathdefault as a noop in the usetex preamble.Conflicts: lib/matplotlib/ticker.py change of a near-by conditional from np.abs -> abs caused conflict
Fix use of psfrags in ps backend + usetex.Conflicts:lib/matplotlib/backends/backend_ps.py - near by change of rcParams -> mpl.rcParamslib/matplotlib/texmanager.py - do not implicitly backport rcParam deprecations
Fix baseline alignment when using usetex.Conflicts:lib/matplotlib/tests/test_usetex.py - import np and formatting issues on decorator
FIX: eps + usetex combo.
…t-of-pr-17261-on-v3.2.xBackport PRmatplotlib#17261 on branch v3.2.x (avoid calling wx.Bitmap() if width or height is zero)
…t-of-pr-17271-on-v3.2.xBackport PRmatplotlib#17271 on branch v3.2.x (MNT: do not try to import xml.etree.cElementTree)
sigh, I guess I'm doing this again... Will likely force push to this branch later. |
Conflicts:doc/missing-references.json - regeneratedlib/matplotlib/animation.py - kept master version, small and big fixes to writer selection fallbacklib/matplotlib/backends/backend_ps.py - whitespacelib/matplotlib/backends/backend_wx.py - kept master branch version (removed redundent gc fetch)lib/matplotlib/tests/test_backends_interactive.py - kept master version (tweaks to how we skip broken backends)lib/matplotlib/tests/test_collections.py - kept newly added test on masterlib/matplotlib/tests/test_gridspec.py - kept newly added assert on masterlib/matplotlib/tests/test_pyplot.py - kept newly added tests on masterlib/matplotlib/tests/test_usetex.py - kept newly added test on masterlib/matplotlib/texmanager.py - kept master branch state, due to partial backport of changeslib/matplotlib/ticker.py - do not revive removed deprecated accessor
Well, rerere saved the day! |
QuLogic approved these changesMay 1, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Seems all reasonable.
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
Release criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
Normally just do the merge and push, but we merged a number of other PRs to master in between starting this and the tests passing locally, This seems simpler to manage than re-doing the merge against current master (the conflicts were not bad, but don't really want to make sure I got them all right again).