Merge 2.x to master #6356
Merged
Merge 2.x to master #6356
Conversation
This file contains 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
…ding_issue_test TST: skip broken test
The function quote_ps_string is used to sanitize the result of np.tostring (which really returns bytes) to make sure no 'special' ps characters make it through. We were trying to use unicode to replace in a byte string We also need to decode bytes to unicode to put the string into the ps file. closes matplotlib#6226
FIX: use b'' when escaping array as strings in ps
MNT: trap inappropriate use of color kwarg in scatter; closes matplotlib#6266
FIX: plug a theoretical security hole
FIX: Seaborn sheets
Force Qt validator to use C locale.
Only render markers on a line when markersize > 0
If the user functions return None, raise RuntimeError. Suggested in matplotlib#6332
MNT: be explicitly strict in FunctionAnimation
BLD: make minimum cycler version 0.10.0
API/ENH: Color cycle handling
…-maint MAINT: Updates to formatters in `matplotlib.ticker` Conflicts: .mailmap - just added the 1 new line, did not change any others lib/matplotlib/tests/test_ticker.py - whitespace vs new tests
…rker-rc Add default scatter marker option to rcParams
… an earlier version
Fix link check in docs build
|
Ignoring the tiny drop in coverage this passes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A few tricky conflicts so just doing this via a PR to make sure it works correctly