diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 65c7260059fd..f46c344662a6 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3346,6 +3346,8 @@ def _update_dict(dictionary, rc_name, properties): # filled symbol, if the users want more control use # flierprops flierprops['color'] = color + flierprops['markerfacecolor'] = color + flierprops['markeredgecolor'] = color # replace medians if necessary: if usermedians is not None: @@ -3558,23 +3560,34 @@ 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'] + ) + if rcParams['_internal.classic_mode']: + final_boxprops['facecolor'] = 'white' 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: @@ -3584,23 +3597,44 @@ 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'], + ) 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/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle index 800cda75f5de..bb66b6c420e2 100644 --- a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle +++ b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle @@ -348,6 +348,10 @@ boxplot.meanprops.color: r boxplot.meanprops.linestyle: - boxplot.meanprops.linewidth: 1.0 boxplot.medianprops.color: r +boxplot.meanprops.marker: s +boxplot.meanprops.markerfacecolor: r +boxplot.meanprops.markeredgecolor: k +boxplot.meanprops.markersize: 6.0 boxplot.medianprops.linestyle: - boxplot.medianprops.linewidth: 1.0 boxplot.notch: False @@ -503,4 +507,4 @@ animation.convert_path: convert # Path to ImageMagick's convert binary. animation.convert_args: animation.html: none -_internal.classic_mode: True \ No newline at end of file +_internal.classic_mode: True diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index 375a2106a23a..6d44a8f0dd56 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -941,21 +941,21 @@ 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_or_auto], '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], @@ -965,9 +965,13 @@ def validate_animation_writer_path(p): 'boxplot.medianprops.linewidth': [1.0, validate_float], 'boxplot.medianprops.linestyle': ['-', six.text_type], - 'boxplot.meanprops.color': ['C3', validate_color], + 'boxplot.meanprops.color': ['C2', validate_color], + 'boxplot.meanprops.marker': ['^', six.text_type], + 'boxplot.meanprops.markerfacecolor': ['C2', validate_color], + 'boxplot.meanprops.markeredgecolor': ['C2', validate_color], + 'boxplot.meanprops.markersize': [6, validate_float], + 'boxplot.meanprops.linestyle': ['--', 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..f593bac0a36e 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..13f105865d8b 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..c037fe0fa4d3 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 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +L 0 4 +" id="mfe99b04491" style="stroke:#000000;"/> - + - + +L 0 -4 +" id="m639c9bfd14" style="stroke:#000000;"/> - + @@ -182,20 +65,20 @@ L 12.40625 0 z " id="DejaVuSans-31"/> - + - + - + - + - + @@ -225,7 +108,7 @@ Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 " id="DejaVuSans-32"/> - + @@ -233,24 +116,24 @@ Q 31.109375 20.453125 19.1875 8.296875 - + +L -4 0 +" id="mfc2cdf6ca6" style="stroke:#000000;"/> - + - + +L 4 0 +" id="mf5cac1504d" style="stroke:#000000;"/> - + @@ -313,7 +196,7 @@ Q 6.59375 54.828125 13.0625 64.515625 Q 19.53125 74.21875 31.78125 74.21875 " id="DejaVuSans-30"/> - + @@ -321,19 +204,19 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + - + - + @@ -341,19 +224,19 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + - + - + - + @@ -361,86 +244,209 @@ 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..81ab4efdec98 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..d5cc174c9fbc 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..54ca2b8e6abf 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..a3e3e74ecc37 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..7a8f5b972981 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..6ce117760417 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 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +L 0 4 +" id="m5ef6a5bedd" style="stroke:#000000;"/> - + - + +L 0 -4 +" id="mefee3186f9" style="stroke:#000000;"/> - + - + - + - + - + - + +L -4 0 +" id="m0a24617842" style="stroke:#000000;"/> - + - + +L 4 0 +" id="m54f1c1b715" style="stroke:#000000;"/> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + - + - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + - - - + + - - + + + - - - + + + + - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + - + - + - + - + - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + 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..c51b8091d2be 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..46ecb7116377 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..6a4ac6125fa6 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..386f91d03bad 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..7fd2bd3e6514 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..3bb66815d266 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..94b613812559 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..d0760079651b 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..f578d26703c3 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..1360084f2ecb 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..9a580e8d5741 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..3cff7dc2055c 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..5bbc79bff4c1 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..979d038f8343 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..de6d5e814f65 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..2bd1426253a9 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..ca2352610858 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..18173176d378 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..7c4f3c8dff44 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..71af5949a24a 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..90e71780199f 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..1ab847e80898 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..c93da7dc0dee 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..89e53a526bf5 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 ff937921cef5..dff60eb44690 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -1412,7 +1412,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( @@ -1426,7 +1427,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( @@ -1441,7 +1443,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( @@ -1456,7 +1459,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( @@ -1472,7 +1476,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( @@ -1486,7 +1492,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( @@ -1502,7 +1510,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( @@ -1516,7 +1525,8 @@ def test_bxp_patchartist(): @image_comparison(baseline_images=['bxp_custompatchartist'], remove_text=True, extensions=['png'], - savefig_kwarg={'dpi': 40}) + savefig_kwarg={'dpi': 100}, + style='default') def test_bxp_custompatchartist(): np.random.seed(937) logstats = matplotlib.cbook.boxplot_stats( @@ -1531,7 +1541,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( @@ -1546,7 +1557,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( @@ -1561,7 +1573,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( @@ -1576,7 +1589,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( @@ -1591,7 +1605,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( @@ -1606,7 +1621,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( @@ -1621,7 +1637,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( @@ -1635,7 +1652,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( @@ -1649,7 +1667,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( @@ -1663,7 +1682,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( @@ -1677,7 +1697,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( @@ -1691,7 +1712,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( @@ -1705,7 +1727,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( @@ -1719,7 +1742,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( @@ -1755,7 +1779,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]) @@ -1772,7 +1798,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]) @@ -1787,7 +1814,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]) @@ -1801,6 +1829,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) @@ -1822,7 +1851,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) @@ -1884,7 +1914,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]) @@ -1900,7 +1930,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) @@ -1947,7 +1977,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() diff --git a/matplotlibrc.template b/matplotlibrc.template index fddfee7d05a4..56b973951b6f 100644 --- a/matplotlibrc.template +++ b/matplotlibrc.template @@ -115,7 +115,7 @@ backend : $TEMPLATE_BACKEND ### Boxplot #boxplot.notch : False #boxplot.vertical : True -#boxplot.whiskers : 1 +#boxplot.whiskers : 1.5 #boxplot.bootstrap : None #boxplot.patchartist : False #boxplot.showmeans : False @@ -144,14 +144,14 @@ backend : $TEMPLATE_BACKEND #boxplot.capprops.linewidth : 1.0 #boxplot.capprops.linestyle : '-' -#boxplot.medianprops.color : 'C0' +#boxplot.medianprops.color : 'C1' #boxplot.medianprops.linewidth : 1.0 #boxplot.medianprops.linestyle : '-' -#boxplot.meanprops.color : 'C1' +#boxplot.meanprops.color : 'C2' #boxplot.meanprops.marker : '^' -#boxplot.meanprops.markerfacecolor : 'C1' -#boxplot.meanprops.markeredgecolor : 'C1' +#boxplot.meanprops.markerfacecolor : 'C2' +#boxplot.meanprops.markeredgecolor : 'C2' #boxplot.meanprops.markersize : 6 #boxplot.meanprops.linestyle : 'none' #boxplot.meanprops.linewidth : 1.0