/matplotlib

Merge 2.x to master #6356

Merged
merged 21 commits into from May 1, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.1 (next point r...
6 participants
@jenshnielsen @mdboom @QuLogic @WeatherGod @tacaswell @dopplershift
@jenshnielsen
Owner

jenshnielsen commented May 1, 2016

A few tricky conflicts so just doing this via a PR to make sure it works correctly

jenshnielsen and others added some commits Apr 3, 2016

@jenshnielsen @jenshnielsen jenshnielsen Merge pull request #6263 from tacaswell/tst_skip_float_rounding_issue… 
…_test

TST: skip broken test
44e7356
@WeatherGod WeatherGod A feeble attempt to plug a theoretical security hole
b67deca
@tacaswell tacaswell FIX: use b'' when escaping array as strings in ps 
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 #6226
97953f3
@mdboom mdboom Merge pull request #6282 from tacaswell/fix_ps_string_escaping 
FIX: use b'' when escaping array as strings in ps
56dd604
@WeatherGod WeatherGod Merge pull request #6267 from efiring/scatter-color 
MNT: trap inappropriate use of color kwarg in scatter; closes #6266
1f1b8b8
@mdboom mdboom Merge pull request #6300 from mdboom/linewidth 
Remake of #6286
b6e0b9b
@tacaswell tacaswell Merge pull request #6274 from WeatherGod/plug_hole 
FIX: plug a theoretical security hole
d5d694b
@tacaswell tacaswell Merge pull request #6311 from egpbos/seaborn_sheets 
FIX: Seaborn sheets
 d16c258
@tacaswell tacaswell Merge pull request #6241 from anntzer/qt5-validator-locale 
Force Qt validator to use C locale.
c1cd4f2
@tacaswell tacaswell Merge pull request #6314 from henningpohl/patch-1 
Only render markers on a line when markersize > 0
38d9638
@tacaswell tacaswell MNT: be explicitly strict in FunctionAnimation 
If the user functions return None, raise RuntimeError.

Suggested in #6332
65507a0
@dopplershift dopplershift Merge pull request #6336 from tacaswell/mnt_stricter_animation 
MNT: be explicitly strict in FunctionAnimation
7cb9d1f
@WeatherGod WeatherGod Merge pull request #6340 from tacaswell/bld_update_cycler_dep 
BLD: make minimum cycler version 0.10.0
9f83d53
@tacaswell tacaswell API/ENH: Color cycle handling 
API/ENH: Color cycle handling
 e524354
@tacaswell tacaswell Merge pull request #6253 from madphysicist/ticker-formatter-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
668f292
@tacaswell tacaswell Merge pull request #6328 from benjamincongdon/ft-scatter-marker-rc 
Add default scatter marker option to rcParams
ad81e3f
@tacaswell tacaswell Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
360b2f7
@jenshnielsen jenshnielsen Linkchecker uses requests but is broken with requests 2.10.0 so force… 
… an earlier version
482ddad
@tacaswell tacaswell Merge pull request #6351 from jenshnielsen/fixlinkcheck 
Fix link check in docs build
d56d544
@tacaswell tacaswell Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
e63dff6
@jenshnielsen jenshnielsen Merge remote-tracking branch 'matplotlib/v2.x'

Some checks were not successful

1 failing and 2 successful checks
coverage/coveralls — Coverage decreased (-0.007%) to 69.652%
Details
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
e6ebf8e

mdboom added the needs_review label May 1, 2016

@jenshnielsen
Owner

jenshnielsen commented May 1, 2016

Ignoring the tiny drop in coverage this passes

@jenshnielsen jenshnielsen merged commit c227b14 into matplotlib:master May 1, 2016
2 of 3 checks passed

2 of 3 checks passed

coverage/coveralls Coverage decreased (-0.007%) to 69.652%
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

mdboom removed the needs_review label May 1, 2016

jenshnielsen deleted the jenshnielsen:2xtomaster branch May 1, 2016

QuLogic added this to the 2.1 (next point release) milestone May 2, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment