diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 0671a1a34385..1830cdbd813c 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3516,23 +3516,32 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True, # box properties if patch_artist: - final_boxprops = dict(linestyle='solid', edgecolor='black', - facecolor='white', linewidth=1) + final_boxprops = dict( + linestyle=rcParams['boxplot.boxprops.linestyle'], + edgecolor=rcParams['boxplot.boxprops.color'], + facecolor=rcParams['patch.facecolor'], + linewidth=rcParams['boxplot.boxprops.linewidth'] + ) else: - final_boxprops = dict(linestyle='-', color='blue') + final_boxprops = dict( + linestyle=rcParams['boxplot.boxprops.linestyle'], + color=rcParams['boxplot.boxprops.color'], + ) if boxprops is not None: final_boxprops.update(boxprops) # other (cap, whisker) properties final_whiskerprops = dict( - linestyle='--', - color='blue', + linestyle=rcParams['boxplot.whiskerprops.linestyle'], + linewidth=rcParams['boxplot.whiskerprops.linewidth'], + color=rcParams['boxplot.whiskerprops.color'], ) final_capprops = dict( - linestyle='-', - color='black', + linestyle=rcParams['boxplot.capprops.linestyle'], + linewidth=rcParams['boxplot.capprops.linewidth'], + color=rcParams['boxplot.capprops.color'], ) if capprops is not None: @@ -3542,23 +3551,45 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True, final_whiskerprops.update(whiskerprops) # set up the default flier properties - final_flierprops = dict(linestyle='none', marker='+', color='blue') + final_flierprops = dict( + linestyle=rcParams['boxplot.flierprops.linestyle'], + linewidth=rcParams['boxplot.flierprops.linewidth'], + color=rcParams['boxplot.flierprops.color'], + marker=rcParams['boxplot.flierprops.marker'], + markerfacecolor=rcParams['boxplot.flierprops.markerfacecolor'], + markeredgecolor=rcParams['boxplot.flierprops.markeredgecolor'], + markersize=rcParams['boxplot.flierprops.markersize'], + ) # flier (outlier) properties if flierprops is not None: final_flierprops.update(flierprops) # median line properties - final_medianprops = dict(linestyle='-', color='red') + final_medianprops = dict( + linestyle=rcParams['boxplot.medianprops.linestyle'], + linewidth=rcParams['boxplot.medianprops.linewidth'], + color=rcParams['boxplot.medianprops.color'], + ) if medianprops is not None: final_medianprops.update(medianprops) # mean (line or point) properties if meanline: - final_meanprops = dict(linestyle='--', color='black') + final_meanprops = dict( + linestyle=rcParams['boxplot.meanprops.linestyle'], + linewidth=rcParams['boxplot.meanprops.linewidth'], + color=rcParams['boxplot.meanprops.color'], + marker='none', + ) else: - final_meanprops = dict(linestyle='none', markerfacecolor='red', - marker='s') + final_meanprops = dict( + linestyle='', + marker=rcParams['boxplot.meanprops.marker'], + markerfacecolor=rcParams['boxplot.meanprops.markerfacecolor'], + markeredgecolor=rcParams['boxplot.meanprops.markeredgecolor'], + markersize=rcParams['boxplot.meanprops.markersize'], + ) if meanprops is not None: final_meanprops.update(meanprops) diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index 3d1b3c310255..d76387d76556 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -907,33 +907,37 @@ def validate_animation_writer_path(p): 'boxplot.showfliers': [True, validate_bool], 'boxplot.meanline': [False, validate_bool], - 'boxplot.flierprops.color': ['C0', validate_color], - 'boxplot.flierprops.marker': ['+', six.text_type], - 'boxplot.flierprops.markerfacecolor': ['auto', validate_color_or_auto], + 'boxplot.flierprops.color': ['k', validate_color], + 'boxplot.flierprops.marker': ['o', six.text_type], + 'boxplot.flierprops.markerfacecolor': ['none', validate_color], 'boxplot.flierprops.markeredgecolor': ['k', validate_color], 'boxplot.flierprops.markersize': [6, validate_float], 'boxplot.flierprops.linestyle': ['none', six.text_type], 'boxplot.flierprops.linewidth': [1.0, validate_float], - 'boxplot.boxprops.color': ['C0', validate_color], + 'boxplot.boxprops.color': ['k', validate_color], 'boxplot.boxprops.linewidth': [1.0, validate_float], 'boxplot.boxprops.linestyle': ['-', six.text_type], - 'boxplot.whiskerprops.color': ['C0', validate_color], + 'boxplot.whiskerprops.color': ['k', validate_color], 'boxplot.whiskerprops.linewidth': [1.0, validate_float], - 'boxplot.whiskerprops.linestyle': ['--', six.text_type], + 'boxplot.whiskerprops.linestyle': ['-', six.text_type], 'boxplot.capprops.color': ['k', validate_color], 'boxplot.capprops.linewidth': [1.0, validate_float], 'boxplot.capprops.linestyle': ['-', six.text_type], - 'boxplot.medianprops.color': ['C1', validate_color], + 'boxplot.medianprops.color': ['C0', validate_color], 'boxplot.medianprops.linewidth': [1.0, validate_float], 'boxplot.medianprops.linestyle': ['-', six.text_type], - 'boxplot.meanprops.color': ['r', validate_color], + 'boxplot.meanprops.color': ['C1', six.text_type], + 'boxplot.meanprops.marker': ['^', six.text_type], + 'boxplot.meanprops.markerfacecolor': ['C1', validate_color], + 'boxplot.meanprops.markeredgecolor': ['C1', validate_color], + 'boxplot.meanprops.markersize': [6, validate_float], + 'boxplot.meanprops.linestyle': ['none', six.text_type], 'boxplot.meanprops.linewidth': [1.0, validate_float], - 'boxplot.meanprops.linestyle': ['-', six.text_type], ## font props 'font.family': [['sans-serif'], validate_stringlist], # used by text object diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf index 4120498a3015..733e595b22c5 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png index 21c7659c8173..4215e6ec9653 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg index f2a12542defa..6848ac425972 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg @@ -2,7 +2,7 @@ - + - - - + - + - + - - - + - + - - - + + + - + - + - + - - - + - - - + + + - - - - @@ -148,21 +154,21 @@ L 518.4 43.2 +L 0 4 +" id="meed7fb9858" style="stroke:#000000;"/> - + +L 0 -4 +" id="mf13e2561f8" style="stroke:#000000;"/> - + @@ -182,7 +188,7 @@ L 12.40625 0 z " id="DejaVuSans-31"/> - + @@ -190,12 +196,12 @@ z - + - + @@ -225,7 +231,7 @@ Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 " id="DejaVuSans-32"/> - + @@ -236,21 +242,21 @@ Q 31.109375 20.453125 19.1875 8.296875 +L -4 0 +" id="m7fdfe205e8" style="stroke:#000000;"/> - + +L 4 0 +" id="m99c940b843" style="stroke:#000000;"/> - + @@ -313,7 +319,7 @@ Q 6.59375 54.828125 13.0625 64.515625 Q 19.53125 74.21875 31.78125 74.21875 " id="DejaVuSans-30"/> - + @@ -323,17 +329,17 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + @@ -343,17 +349,17 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + @@ -363,17 +369,17 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + @@ -381,17 +387,17 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + @@ -400,17 +406,17 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + @@ -419,17 +425,17 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + @@ -439,8 +445,8 @@ Q 19.53125 74.21875 31.78125 74.21875 - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_false_whiskers.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_false_whiskers.png index f364b735aa06..111a7b5d5eb9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_false_whiskers.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_false_whiskers.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_true_whiskers.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_true_whiskers.png index b83137373826..d4315a9627d3 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_true_whiskers.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_true_whiskers.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_mod_artists_after_plotting.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_mod_artists_after_plotting.png index 4e3c3e8e021d..3af2a94597e0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_mod_artists_after_plotting.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_mod_artists_after_plotting.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_no_inverted_whisker.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_no_inverted_whisker.png index cd0a5713c037..5e97c616f92e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_no_inverted_whisker.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_no_inverted_whisker.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf index c72882f0e0b9..62d248c7ad19 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png index 074da9d7ec9a..4af4343145a6 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg index 06e0d4f24384..9b0e98d581b2 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg @@ -2,7 +2,7 @@ - + - - - + - + - + - + - + - + - + +" id="m68e403c1a1" style="stroke:#0000ff;"/> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - @@ -216,33 +216,33 @@ L 518.4 43.2 +L 0 4 +" id="m45f1ddcebe" style="stroke:#000000;"/> - + +L 0 -4 +" id="m7f89bb1783" style="stroke:#000000;"/> - + - + - + @@ -252,93 +252,21 @@ L 0 4 +L -4 0 +" id="m823cf81c09" style="stroke:#000000;"/> - + +L 4 0 +" id="mdb739b6c3a" style="stroke:#000000;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -346,211 +274,187 @@ L -4 0 - - +" style="fill:#ffffff;stroke:#000000;stroke-linejoin:miter;"/> - +" style="fill:#ffffff;stroke:#000000;stroke-linejoin:miter;"/> - - + + - - + + - - + - - + - - - - - - - - - - - - + + + + + - - + - - + + + + + - + + + + - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - + - + - - + + - + - + - + @@ -558,205 +462,109 @@ L 518.4 165.176471 - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + - + - + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - + @@ -764,14 +572,14 @@ L 518.4 287.152941 - - + + - - + + - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym.png index dd2e566a1ead..64c97fc2bad7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym2.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym2.png index e68bf11aec10..db4ea7fe9e8c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym2.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_sym2.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_with_CIarray.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_with_CIarray.png index 0d8c7f146025..c4332ef9eb87 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_with_CIarray.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_with_CIarray.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_baseline.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_baseline.png index c2e24546aa6c..29b445ca05d4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_baseline.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_baseline.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png index 3364f93d4055..5be971868ccd 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png index c9ceef6959ad..455ffc3e552d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png index 0cceb5cd2d19..2ed36cbb38f4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customoutlier.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customoutlier.png index 7f862e2353e6..c5eb960293dc 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customoutlier.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customoutlier.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png index 3628a47b7509..a01e0905be75 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompositions.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompositions.png index af1494c21914..ba6b756f2814 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompositions.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompositions.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwhisker.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwhisker.png index 1c0cbc22519a..e1bf36767310 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwhisker.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwhisker.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwidths.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwidths.png index c6035af7ee35..ba896c732722 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwidths.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customwidths.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_horizontal.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_horizontal.png index a15684018b93..1b1cfae92cd5 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_horizontal.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_horizontal.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_nobox.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_nobox.png index 797b14b32b49..28955f825ec3 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_nobox.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_nobox.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_nocaps.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_nocaps.png index 5f5a2f8c84c7..75043910d078 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_nocaps.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_nocaps.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png index c2b8182eff6f..74f9d5a94f23 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_precentilewhis.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_precentilewhis.png index dec339a0cdf4..f2e984c6e22e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_precentilewhis.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_precentilewhis.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_rangewhis.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_rangewhis.png index 6a89ee8a3d79..131047c152d1 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_rangewhis.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_rangewhis.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_scalarwidth.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_scalarwidth.png index fd47ddb5aa68..ecf0c875f8fd 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_scalarwidth.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_scalarwidth.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_xlabels.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_xlabels.png index 46aef58b9e97..bea51ceb1ac8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_xlabels.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_xlabels.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_ylabels.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_ylabels.png index 08c537eae294..c671cf48479f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_ylabels.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_ylabels.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_custompoint.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_custompoint.png index 0fe133314c7f..f83f00362692 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_custompoint.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_custompoint.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png index 73de67c07647..a9c4f2ddf2a8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_point.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_point.png index cd08b28cc514..d8cd551efbaf 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_point.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_point.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withnotch.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withnotch.png index 5fb5d1046d6d..a2be2c71bcd0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withnotch.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withnotch.png differ diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 45c2bb679db2..be08fa52fbe9 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -1410,7 +1410,8 @@ def bump(a): @image_comparison(baseline_images=['bxp_baseline'], extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_baseline(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1424,7 +1425,8 @@ def test_bxp_baseline(): @image_comparison(baseline_images=['bxp_rangewhis'], extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_rangewhis(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1439,7 +1441,8 @@ def test_bxp_rangewhis(): @image_comparison(baseline_images=['bxp_precentilewhis'], extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_precentilewhis(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1454,7 +1457,8 @@ def test_bxp_precentilewhis(): @image_comparison(baseline_images=['bxp_with_xlabels'], extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_with_xlabels(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1470,7 +1474,9 @@ def test_bxp_with_xlabels(): @image_comparison(baseline_images=['bxp_horizontal'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default', + tol=0.1) def test_bxp_horizontal(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1484,7 +1490,9 @@ def test_bxp_horizontal(): @image_comparison(baseline_images=['bxp_with_ylabels'], extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default', + tol=0.1,) def test_bxp_with_ylabels(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1500,7 +1508,8 @@ def test_bxp_with_ylabels(): @image_comparison(baseline_images=['bxp_patchartist'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_patchartist(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1514,7 +1523,8 @@ def test_bxp_patchartist(): @image_comparison(baseline_images=['bxp_custompatchartist'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_custompatchartist(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1529,7 +1539,8 @@ def test_bxp_custompatchartist(): @image_comparison(baseline_images=['bxp_customoutlier'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_customoutlier(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1544,7 +1555,8 @@ def test_bxp_customoutlier(): @image_comparison(baseline_images=['bxp_withmean_custompoint'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_showcustommean(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1559,7 +1571,8 @@ def test_bxp_showcustommean(): @image_comparison(baseline_images=['bxp_custombox'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_custombox(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1574,7 +1587,8 @@ def test_bxp_custombox(): @image_comparison(baseline_images=['bxp_custommedian'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_custommedian(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1589,7 +1603,8 @@ def test_bxp_custommedian(): @image_comparison(baseline_images=['bxp_customcap'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_customcap(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1604,7 +1619,8 @@ def test_bxp_customcap(): @image_comparison(baseline_images=['bxp_customwhisker'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_customwhisker(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1619,7 +1635,8 @@ def test_bxp_customwhisker(): @image_comparison(baseline_images=['bxp_withnotch'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_shownotches(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1633,7 +1650,8 @@ def test_bxp_shownotches(): @image_comparison(baseline_images=['bxp_nocaps'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_nocaps(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1647,7 +1665,8 @@ def test_bxp_nocaps(): @image_comparison(baseline_images=['bxp_nobox'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_nobox(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1661,7 +1680,8 @@ def test_bxp_nobox(): @image_comparison(baseline_images=['bxp_withmean_point'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_showmean(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1675,7 +1695,8 @@ def test_bxp_showmean(): @image_comparison(baseline_images=['bxp_withmean_line'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_showmeanasline(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1689,7 +1710,8 @@ def test_bxp_showmeanasline(): @image_comparison(baseline_images=['bxp_scalarwidth'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_scalarwidth(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1703,7 +1725,8 @@ def test_bxp_scalarwidth(): @image_comparison(baseline_images=['bxp_customwidths'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_customwidths(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1717,7 +1740,8 @@ def test_bxp_customwidths(): @image_comparison(baseline_images=['bxp_custompositions'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_bxp_custompositions(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1753,7 +1777,9 @@ def test_bxp_bad_positions(): assert_raises(ValueError, ax.bxp, logstats, positions=[2, 3]) -@image_comparison(baseline_images=['boxplot', 'boxplot'], tol=1) +@image_comparison(baseline_images=['boxplot', 'boxplot'], + tol=1, + style='default') def test_boxplot(): x = np.linspace(-7, 7, 140) x = np.hstack([-25, x, 25]) @@ -1770,7 +1796,8 @@ def test_boxplot(): @image_comparison(baseline_images=['boxplot_sym2'], - remove_text=True, extensions=['png']) + remove_text=True, extensions=['png'], + style='default') def test_boxplot_sym2(): x = np.linspace(-7, 7, 140) x = np.hstack([-25, x, 25]) @@ -1785,7 +1812,8 @@ def test_boxplot_sym2(): @image_comparison(baseline_images=['boxplot_sym'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, + style='default') def test_boxplot_sym(): x = np.linspace(-7, 7, 140) x = np.hstack([-25, x, 25]) @@ -1799,6 +1827,7 @@ def test_boxplot_sym(): baseline_images=['boxplot_autorange_false_whiskers', 'boxplot_autorange_true_whiskers'], extensions=['png'], + style='default' ) def test_boxplot_autorange_whiskers(): x = np.ones(140) @@ -1820,7 +1849,8 @@ def _rc_test_bxp_helper(ax, rc_dict): return ax @image_comparison(baseline_images=['boxplot_rc_parameters'], - savefig_kwarg={'dpi': 100}, remove_text=True, tol=1) + savefig_kwarg={'dpi': 100}, remove_text=True, + tol=1, style='default') def test_boxplot_rc_parameters(): fig, ax = plt.subplots(3) @@ -1882,7 +1912,7 @@ def test_boxplot_rc_parameters(): @image_comparison(baseline_images=['boxplot_with_CIarray'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, style='default') def test_boxplot_with_CIarray(): x = np.linspace(-7, 7, 140) x = np.hstack([-25, x, 25]) @@ -1898,7 +1928,7 @@ def test_boxplot_with_CIarray(): @image_comparison(baseline_images=['boxplot_no_inverted_whisker'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, style='default') def test_boxplot_no_weird_whisker(): x = np.array([3, 9000, 150, 88, 350, 200000, 1400, 960], dtype=np.float64) @@ -1945,7 +1975,7 @@ def test_boxplot_bad_ci_2(): @image_comparison(baseline_images=['boxplot_mod_artists_after_plotting'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 40}, style='default') def test_boxplot_mod_artist_after_plotting(): x = [0.15, 0.11, 0.06, 0.06, 0.12, 0.56, -0.56] fig, ax = plt.subplots()