From 12068f325dd2b5881c9e2b24fe5a0df65ade9966 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 15 Jan 2015 11:19:11 -0700 Subject: [PATCH 1/3] Make Travis install mencoder. Attempts to fix #2678. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e2059b87a8cb..07f7c686877c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: install: - pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx - - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools gdb + - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools gdb mencoder # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not From f6e63dac75554002b9139e67f8cfc1ccc20e0816 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 15 Jan 2015 11:28:01 -0700 Subject: [PATCH 2/3] Remove KnownFailure for mencoder in animation tests. --- lib/matplotlib/tests/test_animation.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py index 97ffe5327c60..cc2c629c3dbb 100644 --- a/lib/matplotlib/tests/test_animation.py +++ b/lib/matplotlib/tests/test_animation.py @@ -33,9 +33,6 @@ def check_save_animation(writer, extension='mp4'): if not animation.writers.is_available(writer): raise KnownFailureTest("writer '%s' not available on this system" % writer) - if 'mencoder' in writer: - raise KnownFailureTest("mencoder is broken") - fig, ax = plt.subplots() line, = ax.plot([], []) From 3d193ae6312e011db3179bdfa9674fb0bdd0c523 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 15 Jan 2015 12:33:51 -0700 Subject: [PATCH 3/3] Add bitrate to animation smoke tests. This should help catch more problems in commandline argument handling, like #4003. --- lib/matplotlib/tests/test_animation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py index cc2c629c3dbb..786edeed3337 100644 --- a/lib/matplotlib/tests/test_animation.py +++ b/lib/matplotlib/tests/test_animation.py @@ -54,7 +54,7 @@ def animate(i): F.close() anim = animation.FuncAnimation(fig, animate, init_func=init, frames=5) try: - anim.save(F.name, fps=30, writer=writer) + anim.save(F.name, fps=30, writer=writer, bitrate=500) except UnicodeDecodeError: raise KnownFailureTest("There can be errors in the numpy " + "import stack, " +