rmlopes
diff --git a/‎lib/matplotlib/__init__.py
Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
-5Lines changed: 0 additions & 5 deletions b/‎lib/matplotlib/__init__.py
Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
-5Lines changed: 0 additions & 5 deletions
diff --git a/‎lib/matplotlib/tests/test_animation.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_animation.py
+31-33Lines changed: 31 additions & 33 deletions b/‎lib/matplotlib/tests/test_animation.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_animation.py
+31-33Lines changed: 31 additions & 33 deletions
@@ -1470,10 +1470,8 @@ def _jupyter_nbextension_paths():
 
 default_test_modules = [
     'matplotlib.tests.test_agg',
-    'matplotlib.tests.test_animation',
     'matplotlib.tests.test_arrow_patches',
     'matplotlib.tests.test_artist',
-    'matplotlib.tests.test_axes',
     'matplotlib.tests.test_backend_bases',
     'matplotlib.tests.test_backend_pdf',
     'matplotlib.tests.test_backend_pgf',
@@ -1483,7 +1481,6 @@ def _jupyter_nbextension_paths():
     'matplotlib.tests.test_backend_svg',
     'matplotlib.tests.test_basic',
     'matplotlib.tests.test_bbox_tight',
-    'matplotlib.tests.test_cbook',
     'matplotlib.tests.test_coding_standards',
     'matplotlib.tests.test_collections',
     'matplotlib.tests.test_colorbar',
@@ -1508,7 +1505,6 @@ def _jupyter_nbextension_paths():
     'matplotlib.tests.test_pickle',
     'matplotlib.tests.test_png',
     'matplotlib.tests.test_quiver',
-    'matplotlib.tests.test_rcparams',
     'matplotlib.tests.test_sankey',
     'matplotlib.tests.test_scale',
     'matplotlib.tests.test_simplification',
@@ -1520,7 +1516,6 @@ def _jupyter_nbextension_paths():
     'matplotlib.tests.test_table',
     'matplotlib.tests.test_text',
     'matplotlib.tests.test_texmanager',
-    'matplotlib.tests.test_ticker',
     'matplotlib.tests.test_tightlayout',
     'matplotlib.tests.test_transforms',
     'matplotlib.tests.test_triangulation',
 
@@ -6,9 +6,10 @@
 import os
 import sys
 import tempfile
+
 import numpy as np
-from numpy.testing import assert_equal
-from nose.tools import assert_false, assert_true
+import pytest
+
 import matplotlib as mpl
 from matplotlib import pyplot as plt
 from matplotlib import animation
@@ -67,12 +68,12 @@ def animate(i):
     anim.save(filename, dpi=dpi, writer=writer,
               savefig_kwargs=savefig_kwargs)
 
-    assert_equal(writer.fig, fig)
-    assert_equal(writer.outfile, filename)
-    assert_equal(writer.dpi, dpi)
-    assert_equal(writer.args, ())
-    assert_equal(writer.savefig_kwargs, savefig_kwargs)
-    assert_equal(writer._count, num_frames)
+    assert writer.fig == fig
+    assert writer.outfile == filename
+    assert writer.dpi == dpi
+    assert writer.args == ()
+    assert writer.savefig_kwargs == savefig_kwargs
+    assert writer._count == num_frames
 
 
 @animation.writers.register('null')
@@ -93,23 +94,25 @@ def isAvailable(self):
         return True
 
 
-WRITER_OUTPUT = dict(ffmpeg='mp4', ffmpeg_file='mp4',
-                     mencoder='mp4', mencoder_file='mp4',
-                     avconv='mp4', avconv_file='mp4',
-                     imagemagick='gif', imagemagick_file='gif',
-                     null='null')
+WRITER_OUTPUT = [
+    ('ffmpeg', 'mp4'),
+    ('ffmpeg_file', 'mp4'),
+    ('mencoder', 'mp4'),
+    ('mencoder_file', 'mp4'),
+    ('avconv', 'mp4'),
+    ('avconv_file', 'mp4'),
+    ('imagemagick', 'gif'),
+    ('imagemagick_file', 'gif'),
+    ('null', 'null')
+]
 
 
 # Smoke test for saving animations.  In the future, we should probably
 # design more sophisticated tests which compare resulting frames a-la
 # matplotlib.testing.image_comparison
-def test_save_animation_smoketest():
-    for writer, extension in six.iteritems(WRITER_OUTPUT):
-        yield check_save_animation, writer, extension
-
-
 @cleanup
-def check_save_animation(writer, extension='mp4'):
+@pytest.mark.parametrize('writer, extension', WRITER_OUTPUT)
+def test_save_animation_smoketest(writer, extension):
     try:
         # for ImageMagick the rcparams must be patched to account for
         # 'convert' being a built in MS tool, not the imagemagick
@@ -174,26 +177,21 @@ def test_movie_writer_registry():
     ffmpeg_path = mpl.rcParams['animation.ffmpeg_path']
     # Not sure about the first state as there could be some writer
     # which set rcparams
-    #assert_false(animation.writers._dirty)
-    assert_true(len(animation.writers._registered) > 0)
+    # assert not animation.writers._dirty
+    assert len(animation.writers._registered) > 0
     animation.writers.list()  # resets dirty state
-    assert_false(animation.writers._dirty)
+    assert not animation.writers._dirty
     mpl.rcParams['animation.ffmpeg_path'] = u"not_available_ever_xxxx"
-    assert_true(animation.writers._dirty)
+    assert animation.writers._dirty
     animation.writers.list()  # resets
-    assert_false(animation.writers._dirty)
-    assert_false(animation.writers.is_available("ffmpeg"))
+    assert not animation.writers._dirty
+    assert not animation.writers.is_available("ffmpeg")
     # something which is guaranteed to be available in path
     # and exits immediately
     bin = u"true" if sys.platform != 'win32' else u"where"
     mpl.rcParams['animation.ffmpeg_path'] = bin
-    assert_true(animation.writers._dirty)
+    assert animation.writers._dirty
     animation.writers.list()  # resets
-    assert_false(animation.writers._dirty)
-    assert_true(animation.writers.is_available("ffmpeg"))
+    assert not animation.writers._dirty
+    assert animation.writers.is_available("ffmpeg")
     mpl.rcParams['animation.ffmpeg_path'] = ffmpeg_path
-
-
-if __name__ == "__main__":
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)