Also check luatex version using the general executable checker.

anntzer · anntzer · commit 3bfdb276e107 · 2018-05-07T23:47:32.000-07:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -427,7 +427,8 @@ def wrapper(*args, **kwargs):
 
 @functools.lru_cache()
 def get_executable_info(name):
-    """Get the version of some executables that Matplotlib depends on.
+    """
+    Get the version of some executables that Matplotlib depends on.
 
     .. warning:
        The list of executables that this function supports is set according to
@@ -437,8 +438,8 @@ def get_executable_info(name):
     ----------
     name : str
         The executable to query.  The following values are currently supported:
-        "dvipng", "gs", "inkscape", "pdftops", "tex".  This list is subject to
-        change without notice.
+        "dvipng", "gs", "inkscape", "luatex", "pdftops", "tex".  This list is
+        subject to change without notice.
 
     Returns
     -------
@@ -484,6 +485,9 @@ def impl(args, regex, min_ver=None):
                     None)
     elif name == "inkscape":
         info = impl(["inkscape", "-V"], "^Inkscape ([^ ]*)")
+    elif name == "luatex":
+        info = impl(["luatex", "--version"],
+                    r"^This is LuaTeX, Version (?:beta-)?(\d+\.\d+\.\d+)")
     elif name == "pdftops":
         info = impl(["pdftops", "-v"], "^pdftops version (.*)")
         if info and not ("3.0" <= info.version
@@ -502,7 +506,8 @@ def impl(args, regex, min_ver=None):
 
 
 def get_all_executable_infos():
-    """Query all executables that Matplotlib may need.
+    """
+    Query all executables that Matplotlib may need.
 
     .. warning:
        The list of executables that this function queries is set according to
@@ -515,7 +520,8 @@ def get_all_executable_infos():
     to change without notice.
     """
     return {name: get_executable_info(name)
-            for name in ["dvipng", "gs", "inkscape", "pdftops", "tex"]}
+            for name in ["dvipng", "gs", "inkscape", "luatex", "pdftops",
+                         "tex"]}
 
 
 @cbook.deprecated("3.0")
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -30,11 +30,6 @@
 ###############################################################################
 
 
-_luatex_version_re = re.compile(
-    r'This is LuaTeX, Version (?:beta-)?([0-9]+)\.([0-9]+)\.([0-9]+)'
-)
-
-
 @cbook.deprecated("3.0")
 def get_texcommand():
     """Get chosen TeX system from rc."""
@@ -43,18 +38,6 @@ def get_texcommand():
     return texsystem if texsystem in texsystem_options else "xelatex"
 
 
-def _get_lualatex_version():
-    """Get version of luatex"""
-    output = subprocess.check_output(['lualatex', '--version'])
-    return _parse_lualatex_version(output.decode())
-
-
-def _parse_lualatex_version(output):
-    '''parse the lualatex version from the output of `lualatex --version`'''
-    match = _luatex_version_re.match(output)
-    return tuple(map(int, match.groups()))
-
-
 def get_fontspec():
     """Build fontspec preamble from rc."""
     latex_fontspec = []
@@ -1166,8 +1149,8 @@ def _build_newpage_command(self, width, height):
         so we need to check the lualatex version and use `\pagewidth` if
         the version is 0.85 or newer
         '''
-        texcommand = get_texcommand()
-        if texcommand == 'lualatex' and _get_lualatex_version() >= (0, 85, 0):
+        if (get_texcommand() == 'lualatex'
+                and get_executable_info('luatex') >= '0.85'):
             cmd = r'\page'
         else:
             cmd = r'\pdfpage'
