Merge pull request #14238 from meeseeksmachine/auto-backport-of-pr-14164-on-v3.1.x

timhoffm · web-flow · commit 3b26ee6f6b31 · 2019-05-18T07:56:14.000+02:00
Backport PR #14164 on branch v3.1.x (Fix regexp for dvipng version detection)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -330,7 +330,7 @@ def impl(args, regex, min_ver=None):
                 f"{' '.join(args)}, which output {output}")
 
     if name == "dvipng":
-        return impl(["dvipng", "-version"], "(?m)^dvipng .* (.+)", "1.6")
+        return impl(["dvipng", "-version"], "(?m)^dvipng(?: .*)? (.+)", "1.6")
     elif name == "gs":
         execs = (["gswin32c", "gswin64c", "mgs", "gs"]  # "mgs" for miktex.
                  if sys.platform == "win32" else
