Deprecate checkdep_ghostscript; bump to gs>=9.0.

anntzer · anntzer · commit 8c1ae974e3e4 · 2017-12-02T19:20:03.000-08:00
gs 9.0 was released in 2010 (https://www.ghostscript.com/doc/current/History9.htm#Version9.00).
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -471,8 +471,9 @@ def impl(args, regex, min_ver=None):
         execs = (["gswin32c", "gswin64c", "mgs", "gs"]  # "mgs" for miktex.
                  if sys.platform == "win32" else
                  ["gs"])
-        info = next(filter(None, (impl([e, "--version"], "(.*)", "8.60")
-                                  for e in execs)),
+        info = next((info for info in (impl([e, "--version"], "(.*)", "9")
+                                       for e in execs)
+                     if info),
                     None)
     elif name == "inkscape":
         info = impl(["inkscape", "-V"], "^Inkscape ([^ ]*)")
@@ -516,6 +517,7 @@ def checkdep_dvipng():
     return str(get_executable_info("dvipng").version)
 
 
+@cbook.deprecated("2.2")
 def checkdep_ghostscript():
     info = get_executable_info("gs")
     checkdep_ghostscript.executable = info.executable
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -26,7 +26,7 @@
 from matplotlib.text import Text
 from matplotlib.path import Path
 from matplotlib import _png, rcParams
-from matplotlib.cbook import is_writable_file_like
+from matplotlib.cbook import _backports, is_writable_file_like
 from matplotlib.compat import subprocess
 from matplotlib.compat.subprocess import check_output
 
@@ -170,39 +170,22 @@ def _font_properties_str(prop):
 
 
 def make_pdf_to_png_converter():
-    """
-    Returns a function that converts a pdf file to a png file.
-    """
-
-    tools_available = []
-    # check for pdftocairo
-    try:
-        check_output([str("pdftocairo"), "-v"], stderr=subprocess.STDOUT)
-        tools_available.append("pdftocairo")
-    except:
-        pass
-    # check for ghostscript
-    gs, ver = mpl.checkdep_ghostscript()
-    if gs:
-        tools_available.append("gs")
-
-    # pick converter
-    if "pdftocairo" in tools_available:
+    """Returns a function that converts a pdf file to a png file."""
+    if _backports.which("pdftocairo"):
         def cairo_convert(pdffile, pngfile, dpi):
             cmd = [str("pdftocairo"), "-singlefile", "-png", "-r", "%d" % dpi,
                    pdffile, os.path.splitext(pngfile)[0]]
             check_output(cmd, stderr=subprocess.STDOUT)
         return cairo_convert
-    elif "gs" in tools_available:
+    if mpl.get_executable_info("gs"):
         def gs_convert(pdffile, pngfile, dpi):
             cmd = [str(gs), '-dQUIET', '-dSAFER', '-dBATCH', '-dNOPAUSE', '-dNOPROMPT',
                    '-sDEVICE=png16m', '-dUseCIEColor', '-dTextAlphaBits=4',
                    '-dGraphicsAlphaBits=4', '-dDOINTERPOLATE', '-sOutputFile=%s' % pngfile,
                    '-r%d' % dpi, pdffile]
             check_output(cmd, stderr=subprocess.STDOUT)
         return gs_convert
-    else:
-        raise RuntimeError("No suitable pdf to png renderer found.")
+    raise RuntimeError("No suitable pdf to png renderer found")
 
 
 class LatexError(Exception):
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -13,7 +13,8 @@
 import logging
 
 from tempfile import mkstemp
-from matplotlib import __version__, rcParams, checkdep_ghostscript
+import matplotlib as mpl
+from matplotlib import cbook, __version__, rcParams, checkdep_ghostscript
 from matplotlib.afm import AFM
 from matplotlib.backend_bases import (
     _Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
@@ -53,6 +54,7 @@ def __init__(self):
         self._cached = {}
 
     @property
+    @cbook.deprecated("2.2")
     def gs_exe(self):
         """
         excutable name of ghostscript.
@@ -70,6 +72,7 @@ def gs_exe(self):
         return str(gs_exe)
 
     @property
+    @cbook.deprecated("2.2")
     def gs_version(self):
         """
         version of ghostscript.
@@ -95,6 +98,7 @@ def gs_version(self):
         return gs_version
 
     @property
+    @cbook.deprecated("2.2")
     def supports_ps2write(self):
         """
         True if the installed ghostscript supports ps2write device.
@@ -1506,14 +1510,9 @@ def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     psfile = tmpfile + '.ps'
     dpi = rcParams['ps.distiller.res']
 
-    gs_exe = ps_backend_helper.gs_exe
-    if ps_backend_helper.supports_ps2write: # gs version >= 9
-        device_name = "ps2write"
-    else:
-        device_name = "pswrite"
-
-    command = [str(gs_exe), "-dBATCH", "-dNOPAUSE", "-r%d" % dpi,
-               "-sDEVICE=%s" % device_name, paper_option,
+    command = [mpl.get_executable_info("gs").executable,
+               "-dBATCH", "-dNOPAUSE", "-r%d" % dpi,
+               "-sDEVICE=ps2write", paper_option,
                "-sOutputFile=%s" % psfile, tmpfile]
     _log.debug(command)
     try:
@@ -1536,11 +1535,7 @@ def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
         # For some versions of gs, above steps result in an ps file
         # where the original bbox is no more correct. Do not adjust
         # bbox for now.
-        if ps_backend_helper.supports_ps2write:
-            # fo gs version >= 9 w/ ps2write device
-            pstoeps(tmpfile, bbox, rotated=rotated)
-        else:
-            pstoeps(tmpfile)
+        pstoeps(tmpfile, bbox, rotated=rotated)
 
 
 def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
@@ -1630,8 +1625,8 @@ def get_bbox(tmpfile, bbox):
     hack.
     """
 
-    gs_exe = ps_backend_helper.gs_exe
-    command = [gs_exe, "-dBATCH", "-dNOPAUSE", "-sDEVICE=bbox" "%s" % tmpfile]
+    command = [get_executable_info("gs").executable,
+               "-dBATCH", "-dNOPAUSE", "-sDEVICE=bbox" "%s" % tmpfile]
     _log.debug(command)
     p = subprocess.Popen(command, stdin=subprocess.PIPE,
                          stdout=subprocess.PIPE, stderr=subprocess.PIPE,
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -106,8 +106,8 @@ def get_file_hash(path, block_size=2 ** 20):
             md5.update(data)
 
     if path.endswith('.pdf'):
-        from matplotlib import checkdep_ghostscript
-        md5.update(checkdep_ghostscript()[1].encode('utf-8'))
+        md5.update(str(matplotlib.get_executable_info("gs").version)
+                   .encode('utf-8'))
     elif path.endswith('.svg'):
         md5.update(str(matplotlib.get_executable_info("inkscape").version)
                    .encode('utf-8'))
@@ -238,13 +238,13 @@ def __del__(self):
 
 
 def _update_converter():
-    gs, gs_v = matplotlib.checkdep_ghostscript()
-    if gs_v is not None:
-        def cmd(old, new):
-            return [str(gs), '-q', '-sDEVICE=png16m', '-dNOPAUSE', '-dBATCH',
-             '-sOutputFile=' + new, old]
-        converter['pdf'] = make_external_conversion_command(cmd)
-        converter['eps'] = make_external_conversion_command(cmd)
+    info = matplotlib.get_executable_info("gs")
+    if info:
+        @make_external_conversion_command
+        def _converter(old, new):
+            return [info.executable, '-q', '-sDEVICE=png16m', '-dNOPAUSE',
+                    '-dBATCH', '-sOutputFile=' + new, old]
+        converter['eps'] = converter['pdf'] = _converter
 
     if matplotlib.get_executable_info("inkscape"):
         converter['svg'] = _SVGConverter()
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -18,7 +18,7 @@
 
 
 needs_ghostscript = pytest.mark.xfail(
-    matplotlib.checkdep_ghostscript()[0] is None,
+    matplotlib.get_executable_info("gs") is None,
     reason="This test needs a ghostscript installation")
 
 
