Merge remote-tracking branch 'matplotlib/v2.x'

Author: tacaswell

lib/matplotlib/axes/_axes.py

@@ -6304,24 +6304,19 @@ def _normalize_input(inp, ename='input'):
                     xvals.append(x.copy())
                     yvals.append(y.copy())
 
-            if fill:
-                # add patches in reverse order so that when stacking,
-                # items lower in the stack are plottted on top of
-                # items higher in the stack
-                for x, y, c in reversed(list(zip(xvals, yvals, color))):
-                    patches.append(self.fill(
-                        x, y,
-                        closed=True,
-                        facecolor=c,
-                        margins=margins))
-            else:
-                for x, y, c in reversed(list(zip(xvals, yvals, color))):
-                    split = 2 * len(bins)
-                    patches.append(self.fill(
-                        x[:split], y[:split],
-                        closed=False, edgecolor=c,
-                        fill=False,
-                        margins=margins))
+            #stepfill is closed, step is not
+            split = -1 if fill else 2 * len(bins)
+            # add patches in reverse order so that when stacking,
+            # items lower in the stack are plottted on top of
+            # items higher in the stack
+            for x, y, c in reversed(list(zip(xvals, yvals, color))):
+                patches.append(self.fill(
+                    x[:split], y[:split],
+                    closed=True if fill else None,
+                    facecolor=c,
+                    edgecolor=None if fill else c,
+                    fill=fill if fill else None,
+                    margins=margins))
 
             # we return patches, so put it back in the expected order
             patches.reverse()

lib/matplotlib/rcsetup.py

@@ -975,7 +975,7 @@ def validate_animation_writer_path(p):
     'font.variant':    ['normal', six.text_type],
     'font.stretch':    ['normal', six.text_type],
     'font.weight':     ['normal', six.text_type],
-    'font.size':       [12, validate_float],      # Base font size in points
+    'font.size':       [10, validate_float],      # Base font size in points
     'font.serif':      [['DejaVu Serif', 'Bitstream Vera Serif',
                          'New Century Schoolbook', 'Century Schoolbook L',
                          'Utopia', 'ITC Bookman', 'Bookman',
@@ -1041,7 +1041,7 @@ def validate_animation_writer_path(p):
     'axes.hold':             [True, validate_bool],
     'axes.facecolor':        ['w', validate_color],  # background color; white
     'axes.edgecolor':        ['k', validate_color],  # edge color; black
-    'axes.linewidth':        [1.0, validate_float],  # edge linewidth
+    'axes.linewidth':        [0.8, validate_float],  # edge linewidth
 
     'axes.spines.left':      [True, validate_bool],  # Set visibility of axes
     'axes.spines.right':     [True, validate_bool],  # 'spines', the lines
@@ -1051,7 +1051,7 @@ def validate_animation_writer_path(p):
     'axes.titlesize':        ['large', validate_fontsize],  # fontsize of the
                                                             # axes title
     'axes.titleweight':      ['normal', six.text_type],  # font weight of axes title
-    'axes.titlepad':         [9.0, validate_float],  # pad from axes top to title in points
+    'axes.titlepad':         [4.0, validate_float],  # pad from axes top to title in points
     'axes.grid':             [False, validate_bool],   # display grid or not
     'axes.grid.which':       ['major', validate_axis_locator],  # set wether the gid are by
                                                                 # default draw on 'major'
@@ -1061,7 +1061,7 @@ def validate_animation_writer_path(p):
                                                       # Can be 'x', 'y', 'both'
     'axes.labelsize':        ['medium', validate_fontsize],  # fontsize of the
                                                              # x any y labels
-    'axes.labelpad':         [5.0, validate_float], # space between label and axis
+    'axes.labelpad':         [4.0, validate_float], # space between label and axis
     'axes.labelweight':      ['normal', six.text_type],  # fontsize of the x any y labels
     'axes.labelcolor':       ['k', validate_color],    # color of axis label
     'axes.formatter.limits': [[-7, 7], validate_nseq_int(2)],
@@ -1153,14 +1153,14 @@ def validate_animation_writer_path(p):
     'legend.edgecolor': ['none', validate_color_or_inherit],
 
     # tick properties
-    'xtick.top':         [True, validate_bool],   # draw ticks on the top side
+    'xtick.top':         [False, validate_bool],   # draw ticks on the top side
     'xtick.bottom':      [True, validate_bool],   # draw ticks on the bottom side
-    'xtick.major.size':  [4, validate_float],    # major xtick size in points
+    'xtick.major.size':  [3.5, validate_float],    # major xtick size in points
     'xtick.minor.size':  [2, validate_float],    # minor xtick size in points
-    'xtick.major.width': [1.0, validate_float],  # major xtick width in points
-    'xtick.minor.width': [1.0, validate_float],  # minor xtick width in points
-    'xtick.major.pad':   [4, validate_float],    # distance to label in points
-    'xtick.minor.pad':   [4, validate_float],    # distance to label in points
+    'xtick.major.width': [0.8, validate_float],  # major xtick width in points
+    'xtick.minor.width': [0.6, validate_float],  # minor xtick width in points
+    'xtick.major.pad':   [3.5, validate_float],    # distance to label in points
+    'xtick.minor.pad':   [3.4, validate_float],    # distance to label in points
     'xtick.color':       ['k', validate_color],  # color of the xtick labels
     'xtick.minor.visible':   [False, validate_bool],    # visiablility of the x axis minor ticks
 
@@ -1169,13 +1169,13 @@ def validate_animation_writer_path(p):
     'xtick.direction':   ['out', six.text_type],            # direction of xticks
 
     'ytick.left':        [True, validate_bool],  # draw ticks on the left side
-    'ytick.right':       [True, validate_bool],  # draw ticks on the right side
-    'ytick.major.size':  [4, validate_float],     # major ytick size in points
+    'ytick.right':       [False, validate_bool],  # draw ticks on the right side
+    'ytick.major.size':  [3.5, validate_float],     # major ytick size in points
     'ytick.minor.size':  [2, validate_float],     # minor ytick size in points
-    'ytick.major.width': [1.0, validate_float],   # major ytick width in points
-    'ytick.minor.width': [1.0, validate_float],   # minor ytick width in points
-    'ytick.major.pad':   [4, validate_float],     # distance to label in points
-    'ytick.minor.pad':   [4, validate_float],     # distance to label in points
+    'ytick.major.width': [0.8, validate_float],   # major ytick width in points
+    'ytick.minor.width': [0.6, validate_float],   # minor ytick width in points
+    'ytick.major.pad':   [3.5, validate_float],     # distance to label in points
+    'ytick.minor.pad':   [3.4, validate_float],     # distance to label in points
     'ytick.color':       ['k', validate_color],   # color of the ytick labels
     'ytick.minor.visible':   [False, validate_bool],    # visiablility of the y axis minor ticks
 
@@ -1185,7 +1185,7 @@ def validate_animation_writer_path(p):
 
     'grid.color':        ['#b0b0b0', validate_color],  # grid color
     'grid.linestyle':    ['-', six.text_type],      # solid
-    'grid.linewidth':    [1.0, validate_float],     # in points
+    'grid.linewidth':    [0.8, validate_float],     # in points
     'grid.alpha':        [1.0, validate_float],
 
 
@@ -1203,13 +1203,13 @@ def validate_animation_writer_path(p):
     'figure.autolayout': [False, validate_bool],
     'figure.max_open_warning': [20, validate_int],
 
-    'figure.subplot.left': [0.155, ValidateInterval(0, 1, closedmin=True,
+    'figure.subplot.left': [0.125, ValidateInterval(0, 1, closedmin=True,
                                                        closedmax=True)],
-    'figure.subplot.right': [0.87, ValidateInterval(0, 1, closedmin=True,
+    'figure.subplot.right': [0.9, ValidateInterval(0, 1, closedmin=True,
                                                      closedmax=True)],
-    'figure.subplot.bottom': [0.13, ValidateInterval(0, 1, closedmin=True,
+    'figure.subplot.bottom': [0.11, ValidateInterval(0, 1, closedmin=True,
                                                      closedmax=True)],
-    'figure.subplot.top': [0.87, ValidateInterval(0, 1, closedmin=True,
+    'figure.subplot.top': [0.88, ValidateInterval(0, 1, closedmin=True,
                                                      closedmax=True)],
     'figure.subplot.wspace': [0.2, ValidateInterval(0, 1, closedmin=True,
                                                      closedmax=False)],

lib/matplotlib/tests/baseline_images/test_axes/hist_step_filled.png

@@ -27,7 +27,6 @@
 import matplotlib.markers as mmarkers
 import matplotlib.patches as mpatches
 from numpy.testing import assert_allclose, assert_array_equal
-import warnings
 from matplotlib.cbook import IgnoredKeywordWarning
 import matplotlib.colors as mcolors
 
@@ -36,6 +35,7 @@
 #       different baseline images to prevent race conditions when nose runs
 #       the tests with multiple threads.
 
+
 @image_comparison(baseline_images=['formatter_ticker_001',
                                    'formatter_ticker_002',
                                    'formatter_ticker_003',
@@ -1151,6 +1151,27 @@ def test_hist_steplog():
     plt.hist(data_big, 100, histtype='stepfilled', log=True, orientation='horizontal')
 
 
+@image_comparison(baseline_images=['hist_step_filled'], remove_text=True,
+                  extensions=['png'])
+def test_hist_step_filled():
+    np.random.seed(0)
+    x = np.random.randn(1000, 3)
+    n_bins = 10
+
+    kwargs = [{'fill': True}, {'fill': False}, {'fill': None}, {}]*2
+    types = ['step']*4+['stepfilled']*4
+    fig, axes = plt.subplots(nrows=2, ncols=4)
+    axes = axes.flatten()
+
+    for kg, _type, ax in zip(kwargs, types, axes):
+        ax.hist(x, n_bins, histtype=_type, stacked=True, **kg)
+        ax.set_title('%s/%s' % (kg, _type))
+        ax.set_ylim(ymin=-50)
+
+    patches = axes[0].patches
+    assert all([p.get_facecolor() == p.get_edgecolor() for p in patches])
+
+
 @image_comparison(baseline_images=['hist_step_log_bottom'],
                   remove_text=True, extensions=['png'])
 def test_hist_step_log_bottom():
@@ -1765,7 +1786,7 @@ def test_boxplot():
     ax.set_ylim((-30, 30))
 
     # Reuse testcase from above for a labeled data test
-    data={"x": [x, x]}
+    data = {"x": [x, x]}
     fig, ax = plt.subplots()
     ax.boxplot("x", bootstrap=10000, notch=1, data=data)
     ax.set_ylim((-30, 30))

lib/matplotlib/tests/test_axes.py

@@ -190,7 +190,7 @@ backend      : $TEMPLATE_BACKEND
 # property is not currently implemented.
 #
 # The font.size property is the default font size for text, given in pts.
-# 12pt is the standard value.
+# 10 pt is the standard value.
 #
 #font.family         : sans-serif
 #font.style          : normal
@@ -202,7 +202,7 @@ backend      : $TEMPLATE_BACKEND
 # settings for axes and ticks. Special text sizes can be defined
 # relative to font.size, using the following values: xx-small, x-small,
 # small, medium, large, x-large, xx-large, larger, or smaller
-#font.size           : 12.0
+#font.size           : 10.0
 #font.serif          : DejaVu Serif, Bitstream Vera Serif, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
 #font.sans-serif     : DejaVu Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
 #font.cursive        : Apple Chancery, Textile, Zapf Chancery, Sand, Script MT, Felipa, cursive
@@ -294,12 +294,12 @@ backend      : $TEMPLATE_BACKEND
 #axes.hold           : True    # whether to clear the axes by default on
 #axes.facecolor      : white   # axes background color
 #axes.edgecolor      : black   # axes edge color
-#axes.linewidth      : 1.0     # edge linewidth
+#axes.linewidth      : 0.8     # edge linewidth
 #axes.grid           : False   # display grid or not
 #axes.titlesize      : large   # fontsize of the axes title
-#axes.titlepad       : 9.0     # pad between axes and title in points
+#axes.titlepad       : 4.0     # pad between axes and title in points
 #axes.labelsize      : medium  # fontsize of the x any y labels
-#axes.labelpad       : 5.0     # space between label and axis
+#axes.labelpad       : 4.0     # space between label and axis
 #axes.labelweight    : normal  # weight of the x and y labels
 #axes.labelcolor     : black
 #axes.axisbelow      : 'line'  # draw axis gridlines and ticks below
@@ -361,27 +361,27 @@ backend      : $TEMPLATE_BACKEND
 
 ### TICKS
 # see http://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
-#xtick.top            : True   # draw ticks on the top side
+#xtick.top            : False   # draw ticks on the top side
 #xtick.bottom         : True   # draw ticks on the bottom side
-#xtick.major.size     : 4      # major tick size in points
+#xtick.major.size     : 3.5      # major tick size in points
 #xtick.minor.size     : 2      # minor tick size in points
-#xtick.major.width    : 1.0    # major tick width in points
-#xtick.minor.width    : 1.0    # minor tick width in points
-#xtick.major.pad      : 4      # distance to major tick label in points
-#xtick.minor.pad      : 4      # distance to the minor tick label in points
+#xtick.major.width    : 0.8    # major tick width in points
+#xtick.minor.width    : 0.6    # minor tick width in points
+#xtick.major.pad      : 3.5      # distance to major tick label in points
+#xtick.minor.pad      : 3.4      # distance to the minor tick label in points
 #xtick.color          : k      # color of the tick labels
 #xtick.labelsize      : medium # fontsize of the tick labels
 #xtick.direction      : out    # direction: in, out, or inout
 #xtick.minor.visible  : False  # visibility of minor ticks on x-axis
 
 #ytick.left           : True   # draw ticks on the left side
-#ytick.right          : True   # draw ticks on the right side
-#ytick.major.size     : 4      # major tick size in points
+#ytick.right          : False  # draw ticks on the right side
+#ytick.major.size     : 3.5      # major tick size in points
 #ytick.minor.size     : 2      # minor tick size in points
-#ytick.major.width    : 1.0    # major tick width in points
-#ytick.minor.width    : 1.0    # minor tick width in points
-#ytick.major.pad      : 4      # distance to major tick label in points
-#ytick.minor.pad      : 4      # distance to the minor tick label in points
+#ytick.major.width    : 0.8    # major tick width in points
+#ytick.minor.width    : 0.6    # minor tick width in points
+#ytick.major.pad      : 3.5      # distance to major tick label in points
+#ytick.minor.pad      : 3.4      # distance to the minor tick label in points
 #ytick.color          : k      # color of the tick labels
 #ytick.labelsize      : medium # fontsize of the tick labels
 #ytick.direction      : out    # direction: in, out, or inout
@@ -391,7 +391,7 @@ backend      : $TEMPLATE_BACKEND
 ### GRIDS
 #grid.color       :   b0b0b0    # grid color
 #grid.linestyle   :   -         # solid
-#grid.linewidth   :   1.0       # in points
+#grid.linewidth   :   0.8       # in points
 #grid.alpha       :   1.0       # transparency, between 0.0 and 1.0
 
 ### Legend
@@ -431,14 +431,14 @@ backend      : $TEMPLATE_BACKEND
                                # If less than one this feature is disabled.
 
 # The figure subplot parameters.  All dimensions are a fraction of the
-# figure width or height
-#figure.subplot.left    : 0.155  # the left side of the subplots of the figure
-#figure.subplot.right   : 0.87   # the right side of the subplots of the figure
-#figure.subplot.bottom  : 0.13   # the bottom of the subplots of the figure
-#figure.subplot.top     : 0.87   # the top of the subplots of the figure
+#figure.subplot.left    : 0.125  # the left side of the subplots of the figure
+#figure.subplot.right   : 0.9    # the right side of the subplots of the figure
+#figure.subplot.bottom  : 0.11    # the bottom of the subplots of the figure
+#figure.subplot.top     : 0.88    # the top of the subplots of the figure
 #figure.subplot.wspace  : 0.2    # the amount of width reserved for blank space between subplots
 #figure.subplot.hspace  : 0.2    # the amount of height reserved for white space between subplots
 
+
 ### IMAGES
 #image.aspect : equal             # equal | auto | a number
 #image.interpolation  : nearest   # see help(imshow) for options