Skip to content

Commit ba90bce

Browse files
authored
Merge pull request matplotlib#29569 from anntzer/im71133
2 parents d179666 + fcdeb46 commit ba90bce

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lib/matplotlib/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,8 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
474474
"Failed to find an ImageMagick installation")
475475
else:
476476
path = "convert"
477-
info = impl([path, "--version"], r"^Version: ImageMagick (\S*)")
477+
# Ignore deprecation warning for "convert" on IM>=7.1.1-33.
478+
info = impl([path, "--version"], r"(?sm:.*^)Version: ImageMagick (\S*)")
478479
if info.raw_version == "7.0.10-34":
479480
# https://github.com/ImageMagick/ImageMagick/issues/2720
480481
raise ExecutableNotFoundError(

0 commit comments

Comments
 (0)