Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

jenshnielsen · jenshnielsen · commit 74ead7c16a15 · 2016-06-19T12:28:57.000+01:00
diff --git a/examples/specialty_plots/hinton_demo.py b/examples/specialty_plots/hinton_demo.py
@@ -17,7 +17,7 @@ def hinton(matrix, max_weight=None, ax=None):
     ax = ax if ax is not None else plt.gca()
 
     if not max_weight:
-        max_weight = 2**np.ceil(np.log(np.abs(matrix).max())/np.log(2))
+        max_weight = 2 ** np.ceil(np.log(np.abs(matrix).max()) / np.log(2))
 
     ax.patch.set_facecolor('gray')
     ax.set_aspect('equal', 'box')
@@ -26,7 +26,7 @@ def hinton(matrix, max_weight=None, ax=None):
 
     for (x, y), w in np.ndenumerate(matrix):
         color = 'white' if w > 0 else 'black'
-        size = np.sqrt(np.abs(w))
+        size = np.sqrt(np.abs(w) / max_weight)
         rect = plt.Rectangle([x - size / 2, y - size / 2], size, size,
                              facecolor=color, edgecolor=color)
         ax.add_patch(rect)
diff --git a/tests.py b/tests.py
@@ -59,7 +59,7 @@ def run(extra_args):
     if '--no-network' in sys.argv:
         from matplotlib.testing import disable_internet
         disable_internet.turn_off_internet()
-        extra_args.extend(['--eval-attr="not network"'])
+        extra_args.extend(['-a', '!network'])
         sys.argv.remove('--no-network')
 
     run(extra_args)
