Merge remote-tracking branch 'upstream/main' into patch-2

Author: Quentin Peter

doc/api/next_api_changes/deprecations/22097-AL.rst

@@ -0,0 +1,3 @@
+``AxisArtistHelper.delta1`` and ``AxisArtistHelper.delta2``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... are deprecated with no replacement.

examples/mplot3d/wire3d_animation_sgskip.py

@@ -39,7 +39,7 @@ def generate(X, Y, phi):
 for phi in np.linspace(0, 180. / np.pi, 100):
     # If a line collection is already remove it before drawing.
     if wframe:
-        ax.collections.remove(wframe)
+        wframe.remove()
 
     # Plot the new wireframe and pause briefly before continuing.
     Z = generate(X, Y, phi)

examples/pie_and_polar_charts/bar_of_pie.py

@@ -19,40 +19,36 @@
 fig.subplots_adjust(wspace=0)
 
 # pie chart parameters
-ratios = [.27, .56, .17]
+overall_ratios = [.27, .56, .17]
 labels = ['Approve', 'Disapprove', 'Undecided']
 explode = [0.1, 0, 0]
 # rotate so that first wedge is split by the x-axis
-angle = -180 * ratios[0]
-ax1.pie(ratios, autopct='%1.1f%%', startangle=angle,
-        labels=labels, explode=explode)
+angle = -180 * overall_ratios[0]
+wedges, *_ = ax1.pie(overall_ratios, autopct='%1.1f%%', startangle=angle,
+                     labels=labels, explode=explode)
 
 # bar chart parameters
-
-xpos = 0
-bottom = 0
-ratios = [.33, .54, .07, .06]
+age_ratios = [.33, .54, .07, .06]
+age_labels = ['Under 35', '35-49', '50-65', 'Over 65']
+bottom = 1
 width = .2
-colors = [[.1, .3, .5], [.1, .3, .3], [.1, .3, .7], [.1, .3, .9]]
 
-for j in range(len(ratios)):
-    height = ratios[j]
-    ax2.bar(xpos, height, width, bottom=bottom, color=colors[j])
-    ypos = bottom + ax2.patches[j].get_height() / 2
-    bottom += height
-    ax2.text(xpos, ypos, "%d%%" % (ax2.patches[j].get_height() * 100),
-             ha='center')
+# Adding from the top matches the legend.
+for j, (height, label) in enumerate(reversed([*zip(age_ratios, age_labels)])):
+    bottom -= height
+    bc = ax2.bar(0, height, width, bottom=bottom, color='C0', label=label,
+                 alpha=0.1 + 0.25 * j)
+    ax2.bar_label(bc, labels=[f"{height:.0%}"], label_type='center')
 
 ax2.set_title('Age of approvers')
-ax2.legend(('50-65', 'Over 65', '35-49', 'Under 35'))
+ax2.legend()
 ax2.axis('off')
 ax2.set_xlim(- 2.5 * width, 2.5 * width)
 
 # use ConnectionPatch to draw lines between the two plots
-# get the wedge data
-theta1, theta2 = ax1.patches[0].theta1, ax1.patches[0].theta2
-center, r = ax1.patches[0].center, ax1.patches[0].r
-bar_height = sum([item.get_height() for item in ax2.patches])
+theta1, theta2 = wedges[0].theta1, wedges[0].theta2
+center, r = wedges[0].center, wedges[0].r
+bar_height = sum(age_ratios)
 
 # draw top connecting line
 x = r * np.cos(np.pi / 180 * theta2) + center[0]

examples/ticks/tick_xlabel_top.py

@@ -1,27 +1,32 @@
 """
-==========================================
-Set default x-axis tick labels on the top
-==========================================
+==================================
+Move x-axis tick labels to the top
+==================================
 
-We can use :rc:`xtick.labeltop` and :rc:`xtick.top` and :rc:`xtick.labelbottom`
-and :rc:`xtick.bottom` to control where on the axes ticks and their labels
-appear.
+`~.axes.Axes.tick_params` can be used to configure the ticks. *top* and
+*labeltop* control the visibility tick lines and labels at the top x-axis.
+To move x-axis ticks from bottom to top, we have to activate the top ticks
+and deactivate the bottom ticks::
 
-These properties can also be set in ``.matplotlib/matplotlibrc``.
-"""
+    ax.tick_params(top=True, labeltop=True, bottom=False, labelbottom=False)
 
-import matplotlib.pyplot as plt
-import numpy as np
+.. note::
+
+    If the change should be made for all future plots and not only the current
+    Axes, you can adapt the respective config parameters
 
+    - :rc:`xtick.top`
+    - :rc:`xtick.labeltop`
+    - :rc:`xtick.bottom`
+    - :rc:`xtick.labelbottom`
 
-plt.rcParams['xtick.bottom'] = plt.rcParams['xtick.labelbottom'] = False
-plt.rcParams['xtick.top'] = plt.rcParams['xtick.labeltop'] = True
+"""
 
-x = np.arange(10)
+import matplotlib.pyplot as plt
 
 fig, ax = plt.subplots()
-
-ax.plot(x)
-ax.set_title('xlabel top')  # Note title moves to make room for ticks
+ax.plot(range(10))
+ax.tick_params(top=True, labeltop=True, bottom=False, labelbottom=False)
+ax.set_title('x-ticks moved to the top')
 
 plt.show()

lib/matplotlib/_constrained_layout.py

@@ -573,7 +573,6 @@ def reposition_axes(layoutgrids, fig, renderer, *,
         # coordinates...
         ss = ax.get_subplotspec()
         gs = ss.get_gridspec()
-        nrows, ncols = gs.get_geometry()
         if gs not in layoutgrids:
             return
 

lib/matplotlib/axes/_axes.py

@@ -5624,8 +5624,11 @@ def _interp_grid(X):
         return X, Y, C, shading
 
     def _pcolor_grid_deprecation_helper(self):
-        if any(axis._major_tick_kw["gridOn"]
-               for axis in self._get_axis_list()):
+        grid_active = any(axis._major_tick_kw["gridOn"]
+                          for axis in self._get_axis_list())
+        # explicit is-True check because get_axisbelow() can also be 'line'
+        grid_hidden_by_pcolor = self.get_axisbelow() is True
+        if grid_active and not grid_hidden_by_pcolor:
             _api.warn_deprecated(
                 "3.5", message="Auto-removal of grids by pcolor() and "
                 "pcolormesh() is deprecated since %(since)s and will be "

lib/matplotlib/axes/_base.py

@@ -197,7 +197,7 @@ def _process_plot_format(fmt):
             i += 2
         else:
             raise ValueError(
-                'Unrecognized character %c in format string' % c)
+                f'Unrecognized character {c} in format string {fmt!r}')
 
     if linestyle is None and marker is None:
         linestyle = mpl.rcParams['lines.linestyle']
@@ -708,9 +708,10 @@ def __repr__(self):
             fields += [f"label={self.get_label()!r}"]
         titles = []
         for k in ["left", "center", "right"]:
-            title = self.get_title(loc=k)
-            if title:
-                titles.append(f"{k!r}:{title!r}")
+            if hasattr(self, 'get_title'):
+                title = self.get_title(loc=k)
+                if title:
+                    titles.append(f"{k!r}:{title!r}")
         if titles:
             fields += ["title={" + ",".join(titles) + "}"]
         if self.get_xlabel():

lib/matplotlib/axis.py

@@ -1823,9 +1823,17 @@ def set_ticks(self, ticks, labels=None, *, minor=False, **kwargs):
         Parameters
         ----------
         ticks : list of floats
-            List of tick locations.
+            List of tick locations.  The axis `.Locator` is replaced by a
+            `~.ticker.FixedLocator`.
+
+            Some tick formatters will not label arbitrary tick positions;
+            e.g. log formatters only label decade ticks by default. In
+            such a case you can set a formatter explicitly on the axis
+            using `.Axis.set_major_formatter` or provide formatted
+            *labels* yourself.
         labels : list of str, optional
-            List of tick labels. If not set, the labels show the data value.
+            List of tick labels. If not set, the labels are generated with
+            the axis tick `.Formatter`.
         minor : bool, default: False
             If ``False``, set the major ticks; if ``True``, the minor ticks.
         **kwargs
@@ -2073,8 +2081,7 @@ def _update_label_position(self, renderer):
         if self.label_position == 'bottom':
             try:
                 spine = self.axes.spines['bottom']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
                 # use axes if spine doesn't exist
                 spinebbox = self.axes.bbox
@@ -2084,12 +2091,10 @@ def _update_label_position(self, renderer):
             self.label.set_position(
                 (x, bottom - self.labelpad * self.figure.dpi / 72)
             )
-
         else:
             try:
                 spine = self.axes.spines['top']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
                 # use axes if spine doesn't exist
                 spinebbox = self.axes.bbox
@@ -2336,13 +2341,11 @@ def _update_label_position(self, renderer):
         # get bounding boxes for this axis and any siblings
         # that have been set by `fig.align_ylabels()`
         bboxes, bboxes2 = self._get_tick_boxes_siblings(renderer=renderer)
-
         x, y = self.label.get_position()
         if self.label_position == 'left':
             try:
                 spine = self.axes.spines['left']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
                 # use axes if spine doesn't exist
                 spinebbox = self.axes.bbox
@@ -2355,14 +2358,13 @@ def _update_label_position(self, renderer):
         else:
             try:
                 spine = self.axes.spines['right']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
                 # use axes if spine doesn't exist
                 spinebbox = self.axes.bbox
+
             bbox = mtransforms.Bbox.union(bboxes2 + [spinebbox])
             right = bbox.x1
-
             self.label.set_position(
                 (right + self.labelpad * self.figure.dpi / 72, y)
             )

lib/matplotlib/backend_bases.py

@@ -1528,7 +1528,6 @@ class Done(Exception):
     def _draw(renderer): raise Done(renderer)
 
     with cbook._setattr_cm(figure, draw=_draw), ExitStack() as stack:
-        orig_canvas = figure.canvas
         if print_method is None:
             fmt = figure.canvas.get_default_filetype()
             # Even for a canvas' default output type, a canvas switch may be

lib/matplotlib/backends/_backend_tk.py

@@ -279,6 +279,9 @@ def enter_notify_event(self, event):
             guiEvent=event, xy=self._event_mpl_coords(event))
 
     def button_press_event(self, event, dblclick=False):
+        # set focus to the canvas so that it can receive keyboard events
+        self._tkcanvas.focus_set()
+
         num = getattr(event, 'num', None)
         if sys.platform == 'darwin':  # 2 and 3 are reversed.
             num = {2: 3, 3: 2}.get(num, num)
@@ -387,6 +390,12 @@ def stop_event_loop(self):
             self._event_loop_id = None
         self._tkcanvas.quit()
 
+    def set_cursor(self, cursor):
+        try:
+            self._tkcanvas.configure(cursor=cursord[cursor])
+        except tkinter.TclError:
+            pass
+
 
 class FigureManagerTk(FigureManagerBase):
     """
@@ -467,6 +476,7 @@ def destroy(*args):
                     Gcf.destroy(self)
                 self.window.protocol("WM_DELETE_WINDOW", destroy)
                 self.window.deiconify()
+                self.canvas._tkcanvas.focus_set()
             else:
                 self.canvas.draw_idle()
             if mpl.rcParams['figure.raise_window']:
@@ -629,13 +639,6 @@ def remove_rubberband(self):
     lastrect = _api.deprecated("3.6")(
         property(lambda self: self.canvas._rubberband_rect))
 
-    def set_cursor(self, cursor):
-        window = self.canvas.get_tk_widget().master
-        try:
-            window.configure(cursor=cursord[cursor])
-        except tkinter.TclError:
-            pass
-
     def _set_image_for_button(self, button):
         """
         Set the image for a button based on its pixel size.
@@ -840,8 +843,14 @@ def _rescale(self):
     def add_toolitem(
             self, name, group, position, image_file, description, toggle):
         frame = self._get_groupframe(group)
-        button = NavigationToolbar2Tk._Button(self, name, image_file, toggle,
+        buttons = frame.pack_slaves()
+        if position >= len(buttons) or position < 0:
+            before = None
+        else:
+            before = buttons[position]
+        button = NavigationToolbar2Tk._Button(frame, name, image_file, toggle,
                                               lambda: self._button_click(name))
+        button.pack_configure(before=before)
         if description is not None:
             ToolTip.createToolTip(button, description)
         self._toolitems.setdefault(name, [])
@@ -853,6 +862,7 @@ def _get_groupframe(self, group):
                 self._add_separator()
             frame = tk.Frame(master=self, borderwidth=0)
             frame.pack(side=tk.LEFT, fill=tk.Y)
+            frame._label_font = self._label_font
             self._groups[group] = frame
         return self._groups[group]