Update to 2.0.0b4

- Drop upstreamed or obsolete patches - python-cycler >= 0.10.0 is required - move around Requires and BRs and sort more or less alphabetically - don't ship baseline images for tests (like Debian) - Require stix fonts only when they're not bundled - disable HTML doc building for bootstrapping 2.0.x series - relax image rendering tests tolerance due to freetype version differences - disable some failing tests on aarch64 for now
2016-09-22 15:12:52 +02:00
parent 00a8b9c8fd
commit b295321e02
10 changed files with 439 additions and 295 deletions
@@ -0,0 +1,60 @@
+diff -up matplotlib-2.0.0b4/lib/matplotlib/testing/decorators.py.tests matplotlib-2.0.0b4/lib/matplotlib/testing/decorators.py
+--- matplotlib-2.0.0b4/lib/matplotlib/testing/decorators.py.tests	2016-09-09 05:53:26.000000000 +0200
+++ matplotlib-2.0.0b4/lib/matplotlib/testing/decorators.py	2016-09-21 14:32:15.873155667 +0200
+@@ -268,7 +268,7 @@ class ImageComparisonTest(CleanupTest):
+ 
+                 yield (do_test,)
+ 
+-def image_comparison(baseline_images=None, extensions=None, tol=0,
+def image_comparison(baseline_images=None, extensions=None, tol=0.306,
+                      freetype_version=None, remove_text=False,
+                      savefig_kwarg=None, style='classic'):
+     """
+diff -up matplotlib-2.0.0b4/lib/matplotlib/tests/test_png.py.tests matplotlib-2.0.0b4/lib/matplotlib/tests/test_png.py
+--- matplotlib-2.0.0b4/lib/matplotlib/tests/test_png.py.tests	2016-09-09 05:53:26.000000000 +0200
+++ matplotlib-2.0.0b4/lib/matplotlib/tests/test_png.py	2016-09-21 14:56:44.756256983 +0200
+@@ -17,7 +17,7 @@ on_win = (sys.platform == 'win32')
+ 
+ 
+ @image_comparison(baseline_images=['pngsuite'], extensions=['png'],
+-                  tol=0.01 if on_win else 0)
+                  tol=0.012)
+ def test_pngsuite():
+     dirname = os.path.join(
+         os.path.dirname(__file__),
+diff -up matplotlib-2.0.0b4/lib/matplotlib/tests/test_streamplot.py.tests matplotlib-2.0.0b4/lib/matplotlib/tests/test_streamplot.py
+--- matplotlib-2.0.0b4/lib/matplotlib/tests/test_streamplot.py.tests	2016-09-09 05:53:26.000000000 +0200
+++ matplotlib-2.0.0b4/lib/matplotlib/tests/test_streamplot.py	2016-09-21 14:57:16.279481106 +0200
+@@ -18,7 +18,7 @@ def velocity_field():
+ 
+ 
+ @image_comparison(baseline_images=['streamplot_colormap'],
+-                  tol=0.002)
+                  tol=0.009)
+ def test_colormap():
+     X, Y, U, V = velocity_field()
+     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
+diff -up matplotlib-2.0.0b4/lib/matplotlib/tests/test_patheffects.py.tests-i686 matplotlib-2.0.0b4/lib/matplotlib/tests/test_patheffects.py
+--- matplotlib-2.0.0b4/lib/matplotlib/tests/test_patheffects.py.tests-i686	2016-09-09 05:53:26.000000000 +0200
+++ matplotlib-2.0.0b4/lib/matplotlib/tests/test_patheffects.py	2016-09-21 22:14:17.959623938 +0200
+@@ -110,7 +110,7 @@ def test_SimplePatchShadow_offset():
+     assert_equal(pe._offset, (4, 5))
+ 
+ 
+-@image_comparison(baseline_images=['collection'], tol=0.015)
+@image_comparison(baseline_images=['collection'], tol=0.083)
+ def test_collection():
+     x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
+     data = np.sin(x) + np.cos(y)
+diff -up matplotlib-2.0.0b4/lib/matplotlib/tests/test_transforms.py.tests-i686 matplotlib-2.0.0b4/lib/matplotlib/tests/test_transforms.py
+--- matplotlib-2.0.0b4/lib/matplotlib/tests/test_transforms.py.tests-i686	2016-09-09 05:53:26.000000000 +0200
+++ matplotlib-2.0.0b4/lib/matplotlib/tests/test_transforms.py	2016-09-21 22:14:58.848918119 +0200
+@@ -82,7 +82,7 @@ def test_external_transform_api():
+ 
+ 
+ @image_comparison(baseline_images=['pre_transform_data'],
+-                  tol=0.08)
+                  tol=0.818)
+ def test_pre_transform_plotting():
+     # a catch-all for as many as possible plot layouts which handle
+     # pre-transforming the data NOTE: The axis range is important in this