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

Author: tacaswell

doc/_templates/index.html

@@ -93,8 +93,8 @@ <h1>John Hunter (1968-2012)</h1>
       If you have benefited from John's many contributions, please say
       thanks in the way that would matter most to him.  Please consider
       making a donation to
-      the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
-      Fund</a>.</p>
+      the <a href="http://numfocus.org/johnhunter/">John Hunter Technology
+      Fellowship</a>.</p>
     </td>
    </tr>
   </table>

doc/pyplots/whats_new_98_4_fancy.py

@@ -8,7 +8,7 @@
 def make_boxstyles(ax):
     styles = mpatch.BoxStyle.get_styles()
 
-    for i, (stylename, styleclass) in enumerate(styles.items()):
+    for i, (stylename, styleclass) in enumerate(sorted(styles.items())):
         ax.text(0.5, (float(len(styles)) - 0.5 - i)/len(styles), stylename,
                   ha="center",
                   size=fontsize,

doc/users/whats_new/rcparams.rst

@@ -1,5 +1,27 @@
-Added ``svg.hashsalt`` key to rcParams
-```````````````````````````````````````
+Configuration (rcParams)
+------------------------
+
++----------------------------+--------------------------------------------------+
+| Parameter                  | Description                                      |
++============================+==================================================+
+|`date.autoformatter.year`   | foramt string for 'year' scale dates             |
++----------------------------+--------------------------------------------------+
+|`date.autoformatter.month`  | format string for 'month' scale dates            |
++----------------------------+--------------------------------------------------+
+|`date.autoformatter.day`    | format string for 'day' scale dates              |
++----------------------------+--------------------------------------------------+
+|`date.autoformatter.hour`   | format string for 'hour' scale times             |
++----------------------------+--------------------------------------------------+
+|`date.autoformatter.minute` | format string for 'minute' scale times           |
++----------------------------+--------------------------------------------------+
+|`date.autoformatter.second` | format string for 'second' scale times           |
++----------------------------+--------------------------------------------------+
+|`svg.hashsalt`              | see note                                         |
++----------------------------+--------------------------------------------------+
+
+``svg.hashsalt``
+````````````````
+
 If ``svg.hashsalt`` is ``None`` (which it is by default), the svg backend uses ``uuid4`` to generate the hash salt.
 If it is not ``None``, it must be a string that is used as the hash salt instead of ``uuid4``.
 This allows for deterministic SVG output.

examples/api/filled_step.py

@@ -1,4 +1,5 @@
 import itertools
+from collections import OrderedDict
 from functools import partial
 
 import numpy as np
@@ -174,9 +175,9 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
 hatch_cycle = cycler('hatch', ['/', '*', '+', '|'])
 
 # make some synthetic data
+np.random.seed(0)
 stack_data = np.random.randn(4, 12250)
-dict_data = {lab: d for lab, d in zip(list(c['label'] for c in label_cycle),
-                                      stack_data)}
+dict_data = OrderedDict(zip((c['label'] for c in label_cycle), stack_data))
 
 # work with plain arrays
 fig, (ax1, ax2) = plt.subplots(1, 2, figsize=(9, 4.5), tight_layout=True)

examples/color/named_colors.py

@@ -33,8 +33,11 @@
 sat = [color[1] for color in hsv]
 val = [color[2] for color in hsv]
 
-# Sort by hue, saturation and value.
-ind = np.lexsort((val, sat, hue))
+# Get the color names by themselves.
+names = [color[0] for color in colors_]
+
+# Sort by hue, saturation, value and name.
+ind = np.lexsort((names, val, sat, hue))
 sorted_colors = [colors_[i] for i in ind]
 
 n = len(sorted_colors)

examples/pylab_examples/arrow_demo.py

@@ -214,7 +214,7 @@ def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
         plt.text(x, y, label, size=label_text_size, ha='center', va='center',
              color=labelcolor or fc)
 
-    for p in positions.keys():
+    for p in sorted(positions):
         draw_arrow(p)
 
 # test data

examples/pylab_examples/boxplot_demo2.py

@@ -16,6 +16,7 @@
 randomDists = ['Normal(1,1)', ' Lognormal(1,1)', 'Exp(1)', 'Gumbel(6,4)',
                'Triangular(2,9,11)']
 N = 500
+np.random.seed(0)
 norm = np.random.normal(1, 1, N)
 logn = np.random.lognormal(1, 1, N)
 expo = np.random.exponential(1, N)

examples/pylab_examples/demo_tight_layout.py

@@ -1,16 +1,18 @@
 
 import matplotlib.pyplot as plt
+import itertools
 import warnings
 
-import random
-fontsizes = [8, 16, 24, 32]
+
+fontsizes = itertools.cycle([8, 16, 24, 32])
 
 
 def example_plot(ax):
     ax.plot([1, 2])
-    ax.set_xlabel('x-label', fontsize=random.choice(fontsizes))
-    ax.set_ylabel('y-label', fontsize=random.choice(fontsizes))
-    ax.set_title('Title', fontsize=random.choice(fontsizes))
+    ax.set_xlabel('x-label', fontsize=next(fontsizes))
+    ax.set_ylabel('y-label', fontsize=next(fontsizes))
+    ax.set_title('Title', fontsize=next(fontsizes))
+
 
 fig, ax = plt.subplots()
 example_plot(ax)

examples/pylab_examples/spectrum_demo.py

@@ -1,6 +1,9 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
+
+np.random.seed(0)
+
 dt = 0.01
 Fs = 1/dt
 t = np.arange(0, 10, dt)

examples/pylab_examples/system_monitor.py

@@ -3,23 +3,23 @@
 import numpy as np
 
 
-def get_memory():
+def get_memory(t):
     "Simulate a function that returns system memory"
-    return 100*(0.5 + 0.5*np.sin(0.5*np.pi*time.time()))
+    return 100 * (0.5 + 0.5 * np.sin(0.5 * np.pi * t))
 
 
-def get_cpu():
+def get_cpu(t):
     "Simulate a function that returns cpu usage"
-    return 100*(0.5 + 0.5*np.sin(0.2*np.pi*(time.time() - 0.25)))
+    return 100 * (0.5 + 0.5 * np.sin(0.2 * np.pi * (t - 0.25)))
 
 
-def get_net():
+def get_net(t):
     "Simulate a function that returns network bandwidth"
-    return 100*(0.5 + 0.5*np.sin(0.7*np.pi*(time.time() - 0.1)))
+    return 100 * (0.5 + 0.5 * np.sin(0.7 * np.pi * (t - 0.1)))
 
 
-def get_stats():
-    return get_memory(), get_cpu(), get_net()
+def get_stats(t):
+    return get_memory(t), get_cpu(t), get_net(t)
 
 fig, ax = plt.subplots()
 ind = np.arange(1, 4)
@@ -28,7 +28,7 @@ def get_stats():
 plt.show(block=False)
 
 
-pm, pc, pn = plt.bar(ind, get_stats())
+pm, pc, pn = plt.bar(ind, get_stats(0))
 centers = ind + 0.5*pm.get_width()
 pm.set_facecolor('r')
 pc.set_facecolor('g')
@@ -42,7 +42,7 @@ def get_stats():
 
 start = time.time()
 for i in range(200):  # run for a little while
-    m, c, n = get_stats()
+    m, c, n = get_stats(i / 10.0)
 
     # update the animated artists
     pm.set_height(m)