Merge pull request #16394 from anntzer/ink1

tacaswell · web-flow · commit ae764aefc4f5 · 2020-02-03T11:40:33.000-05:00
Mark inkscape 1.0 as unsupported (at least for now).
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -27,7 +27,7 @@ The following software is required to run the tests:
 
 - pytest_ (>=3.6)
 - Ghostscript_ (>= 9.0, to render PDF files)
-- Inkscape_ (to render SVG files)
+- Inkscape_ (<1.0, to render SVG files)
 
 Optionally you can install:
 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -309,7 +309,7 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
             if min_ver is not None and version < min_ver:
                 raise ExecutableNotFoundError(
                     f"You have {args[0]} version {version} but the minimum "
-                    f"version supported by Matplotlib is {min_ver}.")
+                    f"version supported by Matplotlib is {min_ver}")
             return _ExecInfo(args[0], version)
         else:
             raise ExecutableNotFoundError(
@@ -330,7 +330,12 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
         message = "Failed to find a Ghostscript installation"
         raise ExecutableNotFoundError(message)
     elif name == "inkscape":
-        return impl(["inkscape", "-V"], "^Inkscape ([^ ]*)")
+        info = impl(["inkscape", "-V"], "^Inkscape ([^ ]*)")
+        if info and info.version >= "1.0":
+            raise ExecutableNotFoundError(
+                f"You have Inkscape version {info.version} but Matplotlib "
+                f"only supports Inkscape<1.0")
+        return info
     elif name == "magick":
         path = None
         if sys.platform == "win32":
@@ -367,7 +372,7 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
                          or "0.9" <= info.version <= "1.0"):
             raise ExecutableNotFoundError(
                 f"You have pdftops version {info.version} but the minimum "
-                f"version supported by Matplotlib is 3.0.")
+                f"version supported by Matplotlib is 3.0")
         return info
     else:
         raise ValueError("Unknown executable: {!r}".format(name))
