diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index b65ef777f6ec..3f992e8e0aff 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1500,8 +1500,10 @@ def tk_window_focus(): 'matplotlib.tests.test_png', 'matplotlib.tests.test_quiver', 'matplotlib.tests.test_rcparams', + 'matplotlib.tests.test_sankey', 'matplotlib.tests.test_scale', 'matplotlib.tests.test_simplification', + 'matplotlib.tests.test_skew', 'matplotlib.tests.test_spines', 'matplotlib.tests.test_streamplot', 'matplotlib.tests.test_style', @@ -1514,6 +1516,7 @@ def tk_window_focus(): 'matplotlib.tests.test_transforms', 'matplotlib.tests.test_triangulation', 'matplotlib.tests.test_type1font', + 'matplotlib.tests.test_ttconv', 'matplotlib.tests.test_units', 'matplotlib.tests.test_widgets', 'matplotlib.tests.test_cycles', diff --git a/lib/matplotlib/tests/baseline_images/test_skew/skew_axes.svg b/lib/matplotlib/tests/baseline_images/test_skew/skew_axes.svg index 3176c0f3e2ea..d5410d62d7b2 100644 --- a/lib/matplotlib/tests/baseline_images/test_skew/skew_axes.svg +++ b/lib/matplotlib/tests/baseline_images/test_skew/skew_axes.svg @@ -10,165 +10,161 @@ - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -176,96 +172,96 @@ L577 250.361" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -273,8 +269,8 @@ L518.4 354.24" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.png b/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.png index f3eccec69920..9abe25a233cd 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.png and b/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.svg b/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.svg index 3f7515ec4837..668efde6a8ad 100644 --- a/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.svg +++ b/lib/matplotlib/tests/baseline_images/test_skew/skew_rects.svg @@ -10,169 +10,166 @@ - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -181,70 +178,70 @@ L0 4" id="m741efc42ff" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + @@ -252,149 +249,147 @@ L-4 0" id="mcb0005524f" style="stroke:#000000;stroke-width:0.5;"/> - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -403,60 +398,60 @@ L230.4 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - + - + - + - + - + - + - + - + - + - + @@ -464,149 +459,147 @@ L230.4 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -615,60 +608,60 @@ L460.8 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - + - + - + - + - + - + - + - + - + - + @@ -676,149 +669,147 @@ L460.8 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -827,60 +818,60 @@ L691.2 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - + - + - + - + - + - + - + - + - + - + @@ -888,149 +879,147 @@ L691.2 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1039,60 +1028,60 @@ L921.6 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - + - + - + - + - + - + - + - + - + - + @@ -1100,149 +1089,147 @@ L921.6 86.4" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejo - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1251,60 +1238,60 @@ L0 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - + - + - + - + - + - + - + - + - + - + @@ -1312,149 +1299,147 @@ L0 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1463,60 +1448,60 @@ L230.4 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -1524,149 +1509,147 @@ L230.4 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1675,60 +1658,60 @@ L460.8 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -1736,149 +1719,147 @@ L460.8 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1887,60 +1868,60 @@ L691.2 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -1948,149 +1929,147 @@ L691.2 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2099,60 +2078,60 @@ L921.6 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -2160,149 +2139,147 @@ L921.6 247.283" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2311,60 +2288,60 @@ L0 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - + - + - + - + - + - + - + - + - + - + @@ -2372,149 +2349,147 @@ L0 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2523,60 +2498,60 @@ L230.4 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -2584,149 +2559,147 @@ L230.4 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2735,60 +2708,60 @@ L460.8 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -2796,149 +2769,147 @@ L460.8 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2947,60 +2918,60 @@ L691.2 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -3008,149 +2979,147 @@ L691.2 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3159,60 +3128,60 @@ L921.6 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -3220,149 +3189,147 @@ L921.6 408.166" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3371,60 +3338,60 @@ L0 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - + - + - + - + - + - + - + - + - + - + @@ -3432,149 +3399,147 @@ L0 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3583,60 +3548,60 @@ L230.4 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -3644,149 +3609,147 @@ L230.4 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3795,60 +3758,60 @@ L460.8 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -3856,149 +3819,147 @@ L460.8 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4007,60 +3968,60 @@ L691.2 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -4068,149 +4029,147 @@ L691.2 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4219,60 +4178,60 @@ L921.6 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -4280,149 +4239,147 @@ L921.6 569.048" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4431,60 +4388,60 @@ L0 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - + - + - + - + - + - + - + - + - + - + @@ -4492,149 +4449,147 @@ L0 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoi - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4643,60 +4598,60 @@ L230.4 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -4704,149 +4659,147 @@ L230.4 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4855,60 +4808,60 @@ L460.8 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -4916,149 +4869,147 @@ L460.8 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5067,60 +5018,60 @@ L691.2 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -5128,149 +5079,147 @@ L691.2 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5279,60 +5228,60 @@ L921.6 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - + - + - + - + - + - + - + - + - + - + @@ -5340,80 +5289,80 @@ L921.6 729.931" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-lin - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/lib/matplotlib/tests/test_sankey.py b/lib/matplotlib/tests/test_sankey.py index 9e5e0098a26a..66aae5a18417 100644 --- a/lib/matplotlib/tests/test_sankey.py +++ b/lib/matplotlib/tests/test_sankey.py @@ -4,8 +4,10 @@ import six from matplotlib.sankey import Sankey +from matplotlib.testing.decorators import cleanup +@cleanup def test_sankey(): # lets just create a sankey instance and check the code runs sankey = Sankey() diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py index 1112b0f22574..70a96f271204 100644 --- a/lib/matplotlib/tests/test_units.py +++ b/lib/matplotlib/tests/test_units.py @@ -1,6 +1,7 @@ import matplotlib.pyplot as plt import matplotlib.units as munits import numpy as np +from matplotlib.testing.decorators import cleanup try: # mock in python 3.3+ @@ -11,6 +12,7 @@ # Tests that the conversion machinery works properly for classes that # work as a facade over numpy arrays (like pint) +@cleanup def test_numpy_facade(): # Basic class that wraps numpy array and has units class Quantity(object):