Merge pull request #16408 from anntzer/unavconv

timhoffm · web-flow · commit 9c4e686bbef5 · 2020-02-05T00:44:32.000+01:00
Deprecate avconv animation writers.
diff --git a/doc/api/next_api_changes/deprecations.rst b/doc/api/next_api_changes/deprecations.rst
@@ -173,3 +173,14 @@ variables is deprecated.  Additional fonts may be registered using
 ``matplotlib.compat``
 ~~~~~~~~~~~~~~~~~~~~~
 This module is deprecated.
+
+AVConv animation writer deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``AVConvBase``, ``AVConvWriter`` and ``AVConvFileWriter`` classes, and the
+associated ``animation.avconv_path`` and ``animation.avconv_args`` rcParams are
+deprecated.
+
+Debian 8 (2015, EOL 06/2020) and Ubuntu 14.04 (EOL 04/2019) were the
+last versions of Debian and Ubuntu to ship avconv.  It remains possible
+to force the use of avconv by using the ffmpeg-based writers with
+:rc:`animation.ffmpeg_path` set to "avconv".
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -609,6 +609,8 @@ def gen_candidates():
 # listed in the rcParams (not included in _all_deprecated).
 # Values are tuples of (version,)
 _deprecated_remain_as_none = {
+    'animation.avconv_path': ('3.3',),
+    'animation.avconv_args': ('3.3',),
 }
 
 
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -644,6 +644,7 @@ def _args(self):
 
 
 # Base class of avconv information.  AVConv has identical arguments to FFMpeg.
+@cbook.deprecated('3.3')
 class AVConvBase(FFMpegBase):
     """
     Mixin class for avconv output.
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -478,9 +478,6 @@ animation.frame_format: png       # Controls frame format used by temp files
 animation.ffmpeg_path: ffmpeg     # Path to ffmpeg binary. Without full path
                                   # $PATH is searched
 animation.ffmpeg_args:            # Additional arguments to pass to ffmpeg
-animation.avconv_path: avconv     # Path to avconv binary. Without full path
-                                  # $PATH is searched
-animation.avconv_args:            # Additional arguments to pass to avconv
 animation.convert_path: convert   # Path to ImageMagick's convert binary.
                                   # On Windows use the full path since convert
                                   # is also the name of a system tool.
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -744,9 +744,6 @@
 #animation.ffmpeg_path  : ffmpeg   ## Path to ffmpeg binary. Without full path
                                    ## $PATH is searched
 #animation.ffmpeg_args  :          ## Additional arguments to pass to ffmpeg
-#animation.avconv_path  : avconv   ## Path to avconv binary. Without full path
-                                   ## $PATH is searched
-#animation.avconv_args  :          ## Additional arguments to pass to avconv
 #animation.convert_path : convert  ## Path to ImageMagick's convert binary.
                                    ## On Windows use the full path since convert
                                    ## is also the name of a system tool.

Original file line number	Diff line number	Diff line change
`@@ -609,6 +609,8 @@ def gen_candidates():`
`609`	`609`	`# listed in the rcParams (not included in _all_deprecated).`
`610`	`610`	`# Values are tuples of (version,)`
`611`	`611`	`_deprecated_remain_as_none = {`
	`612`	`+ 'animation.avconv_path': ('3.3',),`
	`613`	`+ 'animation.avconv_args': ('3.3',),`
`612`	`614`	`}`
`613`	`615`
`614`	`616`