Merge branch 'matplotlib:main' into add-3d-plots-to-gallery

j1642 · web-flow · commit 034904d06d50 · 2022-10-07T15:14:46.000Z
diff --git a/.github/workflows/cibuildsdist.yml b/.github/workflows/cibuildsdist.yml
@@ -62,3 +62,9 @@ jobs:
 
       - name: Check version number is not 0
         run: python ./ci/check_version_number.py
+
+      - name: Install twine
+        run: pip install twine
+
+      - name: Check README rendering for PyPI
+        run: twine check dist/*
diff --git a/doc/api/next_api_changes/deprecations/24088-JMK.rst b/doc/api/next_api_changes/deprecations/24088-JMK.rst
@@ -0,0 +1,9 @@
+Colorbars for orphaned mappables are deprecated, but no longer raise
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Before 3.6.0, Colorbars for mappables that do not have a parent axes would
+steal space from the current Axes.  3.6.0 raised an error on this, but without
+a deprecation cycle.  For 3.6.1 this is reverted, the current axes is used,
+but a deprecation warning is shown instead.  In this undetermined case users
+and libraries should explicitly specify what axes they want space to be stolen
+from: ``fig.colorbar(mappable, ax=plt.gca())``.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5272,7 +5272,7 @@ def _fill_between_x_or_y(
                 raise ValueError(f"where size ({where.size}) does not match "
                                  f"{ind_dir} size ({ind.size})")
         where = where & ~functools.reduce(
-            np.logical_or, map(np.ma.getmask, [ind, dep1, dep2]))
+            np.logical_or, map(np.ma.getmaskarray, [ind, dep1, dep2]))
 
         ind, dep1, dep2 = np.broadcast_arrays(
             np.atleast_1d(ind), dep1, dep2, subok=True)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -491,13 +491,15 @@ def test_subclass_clear_cla():
     # Note, we cannot use mocking here as we want to be sure that the
     # superclass fallback does not recurse.
 
-    with pytest.warns(match='Overriding `Axes.cla`'):
+    with pytest.warns(PendingDeprecationWarning,
+                      match='Overriding `Axes.cla`'):
         class ClaAxes(Axes):
             def cla(self):
                 nonlocal called
                 called = True
 
-    with pytest.warns(match='Overriding `Axes.cla`'):
+    with pytest.warns(PendingDeprecationWarning,
+                      match='Overriding `Axes.cla`'):
         class ClaSuperAxes(Axes):
             def cla(self):
                 nonlocal called
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -117,7 +117,7 @@ def test_double_register_builtin_cmap():
             mpl.colormaps[name], name=name, force=True
         )
     with pytest.raises(ValueError, match='A colormap named "viridis"'):
-        with pytest.warns():
+        with pytest.warns(PendingDeprecationWarning):
             cm.register_cmap(name, mpl.colormaps[name])
     with pytest.warns(UserWarning):
         # TODO is warning more than once!
@@ -128,7 +128,7 @@ def test_unregister_builtin_cmap():
     name = "viridis"
     match = f'cannot unregister {name!r} which is a builtin colormap.'
     with pytest.raises(ValueError, match=match):
-        with pytest.warns():
+        with pytest.warns(PendingDeprecationWarning):
             cm.unregister_cmap(name)
 
 
