Merge branch 'matplotlib:main' into shuffleFix

Author: tybeller

.github/workflows/tests.yml

@@ -240,9 +240,13 @@ jobs:
 
           cat mplsetup.cfg
 
-          # All dependencies must have been pre-installed, so that the minver
-          # constraints are held.
-          python -m pip install --no-deps -ve .
+          if [[ "${{ matrix.name-suffix }}" == '(Minimum Versions)' ]]; then
+            # Minimum versions run does not use build isolation so that it
+            # builds against the pre-installed minver dependencies.
+            python -m pip install --no-deps --no-build-isolation -ve .
+          else
+            python -m pip install --no-deps -ve .
+          fi
 
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
             unset CPPFLAGS

doc/api/animation_api.rst

@@ -97,6 +97,11 @@ this hopefully minimalist example gives a sense of how ``init_func``
 and ``func`` are used inside of `FuncAnimation` and the theory of how
 'blitting' works.
 
+.. note::
+
+    The zorder of artists is not taken into account when 'blitting'
+    because the 'blitted' artists are always drawn on top.
+
 The expected signature on ``func`` and ``init_func`` is very simple to
 keep `FuncAnimation` out of your book keeping and plotting logic, but
 this means that the callable objects you pass in must know what

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

@@ -0,0 +1,8 @@
+``contour.ClabelText`` and ``ContourLabeler.set_label_props``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... are deprecated.
+
+Use ``Text(..., transform_rotates_text=True)`` as a replacement for
+``contour.ClabelText(...)`` and ``text.set(text=text, color=color,
+fontproperties=labeler.labelFontProps, clip_box=labeler.axes.bbox)`` as a
+replacement for the ``ContourLabeler.set_label_props(label, text, color)``.

doc/api/next_api_changes/removals/24128-OG.rst

@@ -0,0 +1,17 @@
+``epoch2num`` and ``num2epoch`` are removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These methods convert from unix timestamps to matplotlib floats, but are not
+used internally to Matplotlib, and should not be needed by end users. To
+convert a unix timestamp to datetime, simply use
+`datetime.datetime.utcfromtimestamp`, or to use NumPy `~numpy.datetime64`
+``dt = np.datetime64(e*1e6, 'us')``.
+
+
+Locator and Formatter wrapper methods
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``set_view_interval``, ``set_data_interval`` and ``set_bounds`` methods of
+`.Locator`\s and `.Formatter`\s (and their common base class, TickHelper) are
+removed. Directly manipulate the view and data intervals on the underlying
+axis instead.

doc/api/prev_api_changes/api_changes_3.3.0/deprecations.rst

@@ -545,8 +545,8 @@ experimental and may change in the future.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ... is deprecated.
 
-`.epoch2num` and `.num2epoch` are deprecated
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``epoch2num`` and ``num2epoch`` are deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 These are unused and can be easily reproduced by other date tools.
 `.get_epoch` will return Matplotlib's epoch.
 

doc/api/prev_api_changes/api_changes_3.3.1.rst

@@ -15,7 +15,7 @@ reverts the deprecation.
 Functions ``epoch2num`` and ``dates.julian2num`` use ``date.epoch`` rcParam
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Now `~.dates.epoch2num` and (undocumented) ``julian2num`` return floating point
+Now ``epoch2num`` and (undocumented) ``julian2num`` return floating point
 days since `~.dates.get_epoch` as set by :rc:`date.epoch`, instead of
 floating point days since the old epoch of "0000-12-31T00:00:00".  If
 needed, you can translate from the new to old values as

doc/devel/coding_guide.rst

@@ -45,7 +45,7 @@ When making a PR, pay attention to:
   on GitHub.
 * When updating your PR, instead of adding new commits to fix something, please
   consider amending your initial commit(s) to keep the history clean.
-  You can achieve this using
+  You can achieve this by using
 
   .. code-block:: bash
 

doc/devel/contributing.rst

@@ -222,7 +222,7 @@ rules before submitting a pull request:
 
   or your editor may provide integration with it.  Note that Matplotlib
   intentionally does not use the black_ auto-formatter (1__), in particular due
-  to its unability to understand the semantics of mathematical expressions
+  to its inability to understand the semantics of mathematical expressions
   (2__, 3__).
 
   .. _PEP8: https://www.python.org/dev/peps/pep-0008/

lib/matplotlib/axes/_secondary_axes.py

@@ -1,3 +1,5 @@
+import numbers
+
 import numpy as np
 
 from matplotlib import _api, _docstring
@@ -17,7 +19,7 @@ def __init__(self, parent, orientation, location, functions, **kwargs):
         While there is no need for this to be private, it should really be
         called by those higher level functions.
         """
-
+        _api.check_in_list(["x", "y"], orientation=orientation)
         self._functions = functions
         self._parent = parent
         self._orientation = orientation
@@ -28,7 +30,7 @@ def __init__(self, parent, orientation, location, functions, **kwargs):
             self._axis = self.xaxis
             self._locstrings = ['top', 'bottom']
             self._otherstrings = ['left', 'right']
-        elif self._orientation == 'y':
+        else:  # 'y'
             super().__init__(self._parent.figure, [0, 1., 0.0001, 1], **kwargs)
             self._axis = self.yaxis
             self._locstrings = ['right', 'left']
@@ -40,11 +42,7 @@ def __init__(self, parent, orientation, location, functions, **kwargs):
         self.set_functions(functions)
 
         # styling:
-        if self._orientation == 'x':
-            otheraxis = self.yaxis
-        else:
-            otheraxis = self.xaxis
-
+        otheraxis = self.yaxis if self._orientation == 'x' else self.xaxis
         otheraxis.set_major_locator(mticker.NullLocator())
         otheraxis.set_ticks_position('none')
 
@@ -63,8 +61,8 @@ def set_alignment(self, align):
 
         Parameters
         ----------
-        align : str
-            either 'top' or 'bottom' for orientation='x' or
+        align : {'top', 'bottom', 'left', 'right'}
+            Either 'top' or 'bottom' for orientation='x' or
             'left' or 'right' for orientation='y' axis.
         """
         _api.check_in_list(self._locstrings, align=align)
@@ -92,23 +90,22 @@ def set_location(self, location):
 
         # This puts the rectangle into figure-relative coordinates.
         if isinstance(location, str):
-            if location in ['top', 'right']:
-                self._pos = 1.
-            elif location in ['bottom', 'left']:
-                self._pos = 0.
-            else:
-                raise ValueError(
-                    f"location must be {self._locstrings[0]!r}, "
-                    f"{self._locstrings[1]!r}, or a float, not {location!r}")
-        else:
+            _api.check_in_list(self._locstrings, location=location)
+            self._pos = 1. if location in ('top', 'right') else 0.
+        elif isinstance(location, numbers.Real):
             self._pos = location
+        else:
+            raise ValueError(
+                f"location must be {self._locstrings[0]!r}, "
+                f"{self._locstrings[1]!r}, or a float, not {location!r}")
+
         self._loc = location
 
         if self._orientation == 'x':
             # An x-secondary axes is like an inset axes from x = 0 to x = 1 and
             # from y = pos to y = pos + eps, in the parent's transAxes coords.
             bounds = [0, self._pos, 1., 1e-10]
-        else:
+        else:  # 'y'
             bounds = [self._pos, 0, 1e-10, 1]
 
         # this locator lets the axes move in the parent axes coordinates.
@@ -161,9 +158,7 @@ def set_functions(self, functions):
                              'and the second being the inverse')
         self._set_scale()
 
-    # Should be changed to draw(self, renderer) once the deprecation of
-    # renderer=None and of inframe expires.
-    def draw(self, *args, **kwargs):
+    def draw(self, renderer):
         """
         Draw the secondary axes.
 
@@ -175,7 +170,7 @@ def draw(self, *args, **kwargs):
         self._set_lims()
         # this sets the scale in case the parent has set its scale.
         self._set_scale()
-        super().draw(*args, **kwargs)
+        super().draw(renderer)
 
     def _set_scale(self):
         """
@@ -185,22 +180,18 @@ def _set_scale(self):
         if self._orientation == 'x':
             pscale = self._parent.xaxis.get_scale()
             set_scale = self.set_xscale
-        if self._orientation == 'y':
+        else:  # 'y'
             pscale = self._parent.yaxis.get_scale()
             set_scale = self.set_yscale
         if pscale == self._parentscale:
             return
 
-        if pscale == 'log':
-            defscale = 'functionlog'
-        else:
-            defscale = 'function'
-
         if self._ticks_set:
             ticks = self._axis.get_ticklocs()
 
         # need to invert the roles here for the ticks to line up.
-        set_scale(defscale, functions=self._functions[::-1])
+        set_scale('functionlog' if pscale == 'log' else 'function',
+                  functions=self._functions[::-1])
 
         # OK, set_scale sets the locators, but if we've called
         # axsecond.set_ticks, we want to keep those.
@@ -218,7 +209,7 @@ def _set_lims(self):
         if self._orientation == 'x':
             lims = self._parent.get_xlim()
             set_lim = self.set_xlim
-        if self._orientation == 'y':
+        else:  # 'y'
             lims = self._parent.get_ylim()
             set_lim = self.set_ylim
         order = lims[0] < lims[1]
@@ -249,7 +240,7 @@ def set_color(self, color):
             self.spines.bottom.set_color(color)
             self.spines.top.set_color(color)
             self.xaxis.label.set_color(color)
-        else:
+        else:  # 'y'
             self.tick_params(axis='y', colors=color)
             self.spines.left.set_color(color)
             self.spines.right.set_color(color)