Merge branch 'matplotlib:main' into issue29541

SiddharthKarmokar · web-flow · commit 7ec2b1e40140 · 2025-02-04T22:21:34.000+05:30
diff --git a/doc/users/next_whats_new/depthshading_improvement.rst b/doc/users/next_whats_new/depthshading_improvement.rst
@@ -30,12 +30,10 @@ A simple example:
     S = [(i + 1) * 400 for i in range(10)]
 
     ax.scatter(
-        xs=X,
-        ys=Y,
-        zs=Z,
-        s=S,
+        xs=X, ys=Y, zs=Z, s=S,
         depthshade=True,
         depthshade_minalpha=0.3,
     )
+    ax.view_init(elev=10, azim=-150, roll=0)
 
     plt.show()
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -474,7 +474,8 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
                     "Failed to find an ImageMagick installation")
         else:
             path = "convert"
-        info = impl([path, "--version"], r"^Version: ImageMagick (\S*)")
+        # Ignore deprecation warning for "convert" on IM>=7.1.1-33.
+        info = impl([path, "--version"], r"(?sm:.*^)Version: ImageMagick (\S*)")
         if info.raw_version == "7.0.10-34":
             # https://github.com/ImageMagick/ImageMagick/issues/2720
             raise ExecutableNotFoundError(
