Fix tests

scottshambaugh · scottshambaugh · commit e117b040d29a · 2026-01-21T19:01:05.000-07:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3199,6 +3199,11 @@ def draw(self, renderer):
 
         self._update_title_position(renderer)
 
+        # Clear axis tick caches for this draw cycle
+        for _axis in self._axis_map.values():
+            _axis._cached_ticks_to_draw = None
+            _axis._cached_ticklabel_bboxes = None
+
         if not self.axison:
             for _axis in self._axis_map.values():
                 artists.remove(_axis)
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1281,13 +1281,13 @@ def _set_artist_props(self, a):
             return
         a.set_figure(self.get_figure(root=False))
 
-    def _update_ticks(self, *, _use_cached=False):
+    def _update_ticks(self, *, _use_cache=False):
         """
         Update ticks (position and labels) using the current data interval of
         the axes.  Return the list of ticks that will be drawn.
         """
         # Return cached result if available and requested
-        if _use_cached and self._cached_ticks_to_draw is not None:
+        if _use_cache and self._cached_ticks_to_draw is not None:
             return self._cached_ticks_to_draw
 
         major_locs = self.get_majorticklocs()
@@ -1335,14 +1335,15 @@ def _update_ticks(self, *, _use_cached=False):
                 if mtransforms._interval_contains_close(interval_t, loc_t):
                     ticks_to_draw.append(tick)
 
-        # Cache the result before returning
-        self._cached_ticks_to_draw = ticks_to_draw
+        # Only cache the result when called from the draw path
+        if _use_cache:
+            self._cached_ticks_to_draw = ticks_to_draw
         return ticks_to_draw
 
-    def _get_ticklabel_bboxes(self, ticks, renderer, *, _use_cached=False):
+    def _get_ticklabel_bboxes(self, ticks, renderer, *, _use_cache=False):
         """Return lists of bboxes for ticks' label1's and label2's."""
         # Return cached result if available and requested
-        if _use_cached and self._cached_ticklabel_bboxes is not None:
+        if _use_cache and self._cached_ticklabel_bboxes is not None:
             return self._cached_ticklabel_bboxes
 
         result = ([tick.label1.get_window_extent(renderer)
@@ -1352,8 +1353,9 @@ def _get_ticklabel_bboxes(self, ticks, renderer, *, _use_cached=False):
                    for tick in ticks
                    if tick.label2.get_visible() and tick.label2.get_in_layout()])
 
-        # Cache the result before returning
-        self._cached_ticklabel_bboxes = result
+        # Only cache the result when called from the draw path
+        if _use_cache:
+            self._cached_ticklabel_bboxes = result
         return result
 
     def get_tightbbox(self, renderer=None, *, for_layout_only=False):
@@ -1373,13 +1375,13 @@ def get_tightbbox(self, renderer=None, *, for_layout_only=False):
         # Don't use cached values here - get_tightbbox() is called during
         # layout calculations (e.g., constrained_layout) outside of draw(),
         # and must always recalculate to reflect current state.
-        ticks_to_draw = self._update_ticks(_use_cached=False)
+        ticks_to_draw = self._update_ticks(_use_cache=False)
 
         self._update_label_position(renderer)
 
         # go back to just this axis's tick labels
         tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer,
-                                                _use_cached=False)
+                                                _use_cache=False)
 
         self._update_offset_text_position(tlb1, tlb2)
         self.offsetText.set_text(self.major.formatter.get_offset())
@@ -1426,13 +1428,9 @@ def draw(self, renderer):
             return
         renderer.open_group(__name__, gid=self.get_gid())
 
-        # Clear caches for this draw cycle
-        self._cached_ticks_to_draw = None
-        self._cached_ticklabel_bboxes = None
-
-        ticks_to_draw = self._update_ticks(_use_cached=True)
+        ticks_to_draw = self._update_ticks(_use_cache=True)
         tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer,
-                                                _use_cached=True)
+                                                _use_cache=True)
 
         for tick in ticks_to_draw:
             tick.draw(renderer)
@@ -1448,6 +1446,10 @@ def draw(self, renderer):
         renderer.close_group(__name__)
         self.stale = False
 
+        # Reset cached values for next draw cycle, in case not called by Axes.draw()
+        self._cached_ticks_to_draw = None
+        self._cached_ticklabel_bboxes = None
+
     def get_gridlines(self):
         r"""Return this Axis' grid lines as a list of `.Line2D`\s."""
         ticks = self.get_major_ticks()
@@ -2268,7 +2270,7 @@ def _get_tick_boxes_siblings(self, renderer):
         # If we want to align labels from other Axes:
         for ax in grouper.get_siblings(self.axes):
             axis = ax._axis_map[name]
-            ticks_to_draw = axis._update_ticks(_use_cached=True)
+            ticks_to_draw = axis._update_ticks(_use_cache=True)
             tlb, tlb2 = axis._get_ticklabel_bboxes(ticks_to_draw, renderer,
                                                    _use_cached=True)
             bboxes.extend(tlb)
diff --git a/lib/matplotlib/spines.py b/lib/matplotlib/spines.py
@@ -155,7 +155,7 @@ def get_window_extent(self, renderer=None):
         if self.axis is None or not self.axis.get_visible():
             return bb
         bboxes = [bb]
-        drawn_ticks = self.axis._update_ticks(_use_cached=True)
+        drawn_ticks = self.axis._update_ticks(_use_cache=True)
 
         major_tick = next(iter({*drawn_ticks} & {*self.axis.majorTicks}), None)
         minor_tick = next(iter({*drawn_ticks} & {*self.axis.minorTicks}), None)
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -435,7 +435,7 @@ def _axmask(self):
 
     def _draw_ticks(self, renderer, edgep1, centers, deltas, highs,
                     deltas_per_point, pos):
-        ticks = self._update_ticks(_use_cached=True)
+        ticks = self._update_ticks(_use_cache=True)
         info = self._axinfo
         index = info["i"]
         juggled = info["juggled"]
@@ -640,7 +640,7 @@ def draw_grid(self, renderer):
 
         renderer.open_group("grid3d", gid=self.get_gid())
 
-        ticks = self._update_ticks(_use_cached=True)
+        ticks = self._update_ticks(_use_cache=True)
         if len(ticks):
             # Get general axis information:
             info = self._axinfo
@@ -712,7 +712,7 @@ def get_tightbbox(self, renderer=None, *, for_layout_only=False):
         # Don't use cached values here - get_tightbbox() is called during
         # layout calculations (e.g., constrained_layout) outside of draw(),
         # and must always recalculate to reflect current state.
-        bb_1, bb_2 = self._get_ticklabel_bboxes(ticks, renderer, _use_cached=False)
+        bb_1, bb_2 = self._get_ticklabel_bboxes(ticks, renderer, _use_cache=False)
         other = []
 
         if self.offsetText.get_visible() and self.offsetText.get_text():
