Merge pull request #17355 from jat255/fix_inkscape_detection

QuLogic · web-flow · commit dec272cce324 · 2020-05-08T20:01:40.000-04:00
Change subprocess for inkscape version detection
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -330,7 +330,14 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
         message = "Failed to find a Ghostscript installation"
         raise ExecutableNotFoundError(message)
     elif name == "inkscape":
-        info = impl(["inkscape", "-V"], "^Inkscape ([^ ]*)")
+        try:
+            # use headless option first (works with inkscape version < 1.0):
+            info = impl(["inkscape", "--without-gui", "-V"],
+                        "Inkscape ([^ ]*)")
+        except ExecutableNotFoundError:
+            # if --without-gui is not accepted, we're using Inkscape v > 1.0
+            # so try without the headless option:
+            info = impl(["inkscape", "-V"], "Inkscape ([^ ]*)")
         if info and info.version >= "1.0":
             raise ExecutableNotFoundError(
                 f"You have Inkscape version {info.version} but Matplotlib "
