Merge remote-tracking branch 'origin/v2.1.x' into v2.2.x

tacaswell · tacaswell · commit 0092c2bd9981 · 2018-02-11T23:12:06.000-05:00
diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
@@ -39,7 +39,8 @@ def test_startpoints():
     plt.plot(start_x, start_y, 'ok')
 
 
-@image_comparison(baseline_images=['streamplot_colormap'])
+@image_comparison(baseline_images=['streamplot_colormap'],
+                  tol=.02)
 def test_colormap():
     X, Y, U, V = velocity_field()
     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
