Skip to content

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 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 50 commits into from
May 1, 2020
Merged

V32 mergeup #17285

merged 50 commits into from
May 1, 2020

Conversation

tacaswell
Copy link
Member

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).

timhoffm and others added 30 commits March 19, 2020 17:17
…t-of-pr-16835-on-v3.2.x

Backport PR matplotlib#16835 on branch v3.2.x (Don't forget to export isdeleted on Qt4.)
…t-of-pr-16851-on-v3.2.x

Backport PR matplotlib#16851 on branch v3.2.x (DOC: Fix docstring of Axes.secondary_yaxis.)
…t-of-pr-16867-on-v3.2.x

Backport PR matplotlib#16867 on branch v3.2.x (BLD: Auto-trigger macOS/Linux wheels on tags.)
Merge pull request matplotlib#16870 from timhoffm/xfail

CI: Unbreak CI by xfailing wxAgg test on macOS

Conflicts:
  lib/matplotlib/tests/test_backends_interactive.py
    - Other improvements to messages when skipping tests from
      bc155f0 near by.  Did not
      implicitly backport other changes.
…r-16870-on-v3.2.x

Backport PR matplotlib#16870: Unbreak CI by xfailing wxAgg test on macOS
…t-of-pr-16929-on-v3.2.x

Backport PR matplotlib#16929 on branch v3.2.x (tk: Resize the canvas, not the figure.)
…t-of-pr-16949-on-v3.2.x

Backport PR matplotlib#16949 on branch v3.2.x (TST: Don't modify actual pyplot file for boilerplate test.)
…t-of-pr-16966-on-v3.2.x

Backport PR matplotlib#16966 on branch v3.2.x (Fix animation writer fallback.)
…t-of-pr-16970-on-v3.2.x

Backport PR matplotlib#16970 on branch v3.2.x (tk: Don't resize toolbar during resize event.)
…t-of-pr-16940-on-v3.2.x

Backport PR matplotlib#16940 on branch v3.2.x (DOC/FIX: clarify the docs for check_figures_equal)
…t-of-pr-16980-on-v3.2.x

Backport PR matplotlib#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 request matplotlib#17017 from jklymak/fix-blended-transform
Merge pull request matplotlib#17045 from anntzer/docrefs

Fix missing-references.json.
Conflicts:
	doc/missing-references.json
          - fixed by fully regenerating
…r-17045-on-v3.2.x

Backport PR matplotlib#17045: Fix missing-references.json.
…t-of-pr-17065-on-v3.2.x

Backport PR matplotlib#17065 on branch v3.2.x (Fix macOS CI test failure)
…t-of-pr-17126-on-v3.2.x

Backport PR matplotlib#17126 on branch v3.2.x (Remove Python2/3 info box)
timhoffm and others added 19 commits April 18, 2020 14:36
…-17076-on-v3.2.x

Backport PR matplotlib#17076: Fix SyntaxErrors when running setup in old Python
…8-on-v3.2.x

Backport PR matplotlib#16958: MAINT: Replace uses of tostring with tobytes
…t-of-pr-17240-on-v3.2.x

Backport PR matplotlib#17240 on branch v3.2.x (CI: Download wx wheels for the correct Ubuntu version.)
…17206-on-v3.2.x

Merge pull request matplotlib#17206 from jklymak/fix-bypass-inverse-collection
…t-of-pr-17252-on-v3.2.x

Backport PR matplotlib#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.rcParams
	lib/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
…t-of-pr-17261-on-v3.2.x

Backport PR matplotlib#17261 on branch v3.2.x (avoid calling wx.Bitmap() if width or height is zero)
…t-of-pr-17271-on-v3.2.x

Backport PR matplotlib#17271 on branch v3.2.x (MNT: do not try to import xml.etree.cElementTree)
@tacaswell tacaswell added this to the v3.3.0 milestone Apr 30, 2020
@tacaswell tacaswell added the Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. label Apr 30, 2020
@tacaswell
Copy link
Member Author

sigh, I guess I'm doing this again... Will likely force push to this branch later.

Conflicts:

doc/missing-references.json
  - regenerated
lib/matplotlib/animation.py
 - kept master version, small and  big fixes to writer selection fallback
lib/matplotlib/backends/backend_ps.py
 - whitespace
lib/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 master
lib/matplotlib/tests/test_gridspec.py
 - kept newly added assert on master
lib/matplotlib/tests/test_pyplot.py
 - kept newly added tests on master
lib/matplotlib/tests/test_usetex.py
 - kept newly added test on master
lib/matplotlib/texmanager.py
 - kept master branch state, due to partial backport of changes
lib/matplotlib/ticker.py
 - do not revive removed deprecated accessor
@tacaswell
Copy link
Member Author

Well, rerere saved the day!

Copy link
Member

@QuLogic QuLogic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems all reasonable.

@QuLogic QuLogic merged commit 100c7cf into matplotlib:master May 1, 2020
@tacaswell tacaswell deleted the v32_mergeup branch May 1, 2020 04:29
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.

7 participants