matplotlib · andrew-fennell · May 22, 2022 · May 9, 2022 · May 9, 2022 · May 9, 2022
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -55,7 +55,7 @@ install:
   - conda create -q -n test-environment python=%PYTHON_VERSION% tk "pip<22.0"
   - activate test-environment
   # pull pywin32 from conda because on py38 there is something wrong with finding
-  # the dlls when insalled from pip
+  # the dlls when installed from pip
   - conda install -c conda-forge pywin32
   # install pyqt from conda-forge
   - conda install -c conda-forge pyqt

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -6,3 +6,6 @@ c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
 
 # style: check-docstring-first pre-commit hook
 046533797725293dfc2a6edb9f536b25f08aa636
+
+# chore: fix spelling errors
+686c9e5a413e31c46bb049407d5eca285bcab76d
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -44,7 +44,7 @@ jobs:
     steps:
       - name: Set up QEMU
         if: matrix.cibw_archs == 'aarch64'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -161,8 +161,8 @@ jobs:
 
           # Install dependencies from PyPI.
           python -m pip install --upgrade $PRE \
-            cycler fonttools kiwisolver numpy packaging pillow pyparsing \
-            python-dateutil setuptools-scm \
+            'contourpy>=1.0.1' cycler fonttools kiwisolver numpy packaging \
+            pillow pyparsing python-dateutil setuptools-scm \
             -r requirements/testing/all.txt \
             ${{ matrix.extra-requirements }}
 
@@ -221,14 +221,6 @@ jobs:
         run: |
           python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple --upgrade numpy pandas
 
-          # Turn all warnings to errors, except ignore the distutils deprecations and the find_spec warning
-          cat >> pytest.ini << EOF
-          filterwarnings =
-              error
-              ignore:.*distutils:DeprecationWarning
-              ignore:DynamicImporter.find_spec\(\) not found; falling back to find_module\(\):ImportWarning
-          EOF
-
       - name: Install Matplotlib
         run: |
           ccache -s

diff --git a/.matplotlib-repo b/.matplotlib-repo
@@ -0,0 +1,3 @@
+The existence of this file signals that the code is a matplotlib source repo
+and not an installed version. We use this in __init__.py for gating version
+detection.
diff --git a/doc/README.txt b/doc/README.txt
@@ -14,7 +14,7 @@ documentation.  All of the documentation is written using sphinx, a
 python documentation system built on top of ReST.  This directory contains
 
 * users - the user documentation, e.g., installation, plotting tutorials,
-configuration tips, faq, explaations, etc.
+configuration tips, faq, explanations, etc.
 
 * devel - documentation for Matplotlib developers
 

diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -1,3 +1,8 @@
+:root {
+    --sd-color-primary: #11557C;
+    --sd-color-primary-highlight: #003c63;
+}
+
 a {
     color: #11557C;
     text-decoration: none;
@@ -145,7 +150,7 @@ hr.box-sep {
 }
 
 
-/* multi colunm TOC */
+/* multi column TOC */
 .contents ul {
     list-style-type: none;
     padding-left: 2em;
@@ -174,29 +179,6 @@ hr.box-sep {
     font-size: 1.0em;
 }
 
-
-.mpl-button {
-    background: #11557C;
-    font-weight: normal;
-    display: inline-block;
-    padding: 0 1em;
-    line-height: 2.8;
-    font-size: 16px;
-    text-align: center;
-    cursor: pointer;
-    color: #fff;
-    text-decoration: none;
-    border-radius: 6px;
-    z-index: 1;
-    transition: background .25s ease;
-}
-
-.mpl-button:hover, .mpl-button:active, .mpl-button:focus {
-    background: #003c63;
-    outline-color: #003c63;
-}
-
-
 /* Hide red ¶ between the thumbnail and caption in gallery
 
 Due the way that sphinx-gallery floats its captions the perma-link
@@ -251,25 +233,6 @@ table.property-table td {
     margin: 2.75rem 0;
 }
 
-.sidebar-donate .mpl-button {
-    /* fix width to width of cheatsheet */
-    width: 210px;
-}
-
-/* Two columns for install code blocks */
-div.twocol {
-    padding-left: 0;
-    padding-right: 0;
-    display: flex;
-    gap: 20px;
-}
-
-div.twocol > div {
-    flex-grow: 1;
-    padding: 0;
-    margin: 0;
-}
-
 /* Fix selection of parameter names; remove when fixed in the theme
  * https://github.com/sphinx-doc/sphinx/pull/9763
  */

diff --git a/doc/_static/switcher.json b/doc/_static/switcher.json
@@ -1,22 +1,27 @@
 [
     {
         "name": "3.5 (stable)",
-        "version": "stable"
+        "version": "stable",
+        "url": "https://matplotlib.org/stable"
     },
     {
         "name": "3.6 (dev)",
-        "version": "devdocs"
+        "version": "devdocs",
+        "url": "https://matplotlib.org/devdocs"
     },
     {
         "name": "3.4",
-        "version": "3.4.3"
+        "version": "3.4.3",
+        "url": "https://matplotlib.org/3.4.3"
     },
     {
         "name": "3.3",
-        "version": "3.3.4"
+        "version": "3.3.4",
+        "url": "https://matplotlib.org/3.3.4"
     },
     {
         "name": "2.2",
-        "version": "2.2.4"
-    },
+        "version": "2.2.4",
+        "url": "https://matplotlib.org/2.2.4"
+    }
 ]
diff --git a/doc/_templates/donate_sidebar.html b/doc/_templates/donate_sidebar.html
@@ -1,8 +1,5 @@
-
-
-
 <div class="sidebar-donate">
-  <a href="https://numfocus.org/donate-to-matplotlib" target="_blank">
-    <span class="mpl-button" >Support Matplotlib</span>
+  <a class="sd-btn sd-btn-primary sd-fs-5 sd-px-5 sd-py-2" href="https://numfocus.org/donate-to-matplotlib" target="_blank">
+    Support Matplotlib
   </a>
 </div>
diff --git a/doc/api/axis_api.rst b/doc/api/axis_api.rst
@@ -41,7 +41,6 @@ Inheritance
    :nosignatures:
 
    Axis.clear
-   Axis.cla
    Axis.get_scale
 
 

diff --git a/doc/api/dates_api.rst b/doc/api/dates_api.rst
@@ -9,4 +9,5 @@
 .. automodule:: matplotlib.dates
    :members:
    :undoc-members:
+   :exclude-members: rrule
    :show-inheritance:
diff --git a/doc/api/next_api_changes/behavior/22229-TAC.rst b/doc/api/next_api_changes/behavior/22229-TAC.rst
@@ -1,7 +1,7 @@
-AritistList proxies copy contents on iteration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ArtistList proxies copy contents on iteration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When iterating over the contents of the the dynamically generated proxy lists
+When iterating over the contents of the dynamically generated proxy lists
 for the Artist-type accessors (see :ref:`Behavioural API Changes 3.5 - Axes
 children combined`), a copy of the contents is made.  This ensure that artists
 can safely be added or removed from the Axes while iterating over their children.

diff --git a/doc/api/next_api_changes/behavior/22567-IT.rst b/doc/api/next_api_changes/behavior/22567-IT.rst
@@ -0,0 +1,13 @@
+New algorithm keyword argument to contour and contourf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The contouring functions `~matplotlib.axes.Axes.contour` and
+`~matplotlib.axes.Axes.contourf` have a new keyword argument *algorithm* to
+control which algorithm is used to calculate the contours. There is a choice
+of four algorithms to use, and the default is to use ``algorithm='mpl2014'``
+which is the same algorithm that Matplotlib has been using since 2014.
+
+Other possible values of the *algorithm* keyword argument are ``'mpl2005'``,
+``'serial'`` and ``'threaded'``; see the
+`ContourPy documentation <https://contourpy.readthedocs.io>`_ for further
+details.
diff --git a/doc/api/next_api_changes/behavior/22745-JMK.rst b/doc/api/next_api_changes/behavior/22745-JMK.rst
@@ -0,0 +1,9 @@
+No need to specify renderer for get_tightbbox and get_window_extent
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``get_tightbbox`` and `~.Artist.get_window_extent` methods
+no longer require the *renderer* kwarg, saving users from having to
+querry it from ``fig.canvas.get_renderer``.  If the *renderer*
+kwarg is not supplied these methods first check if there is a cached renderer
+from a previous draw and use that.  If there is no cahched renderer, then
+the methods will use ``fig.canvas.get_renderer()`` as a fallback.
diff --git a/doc/api/next_api_changes/behavior/23031-AL.rst b/doc/api/next_api_changes/behavior/23031-AL.rst
@@ -0,0 +1,5 @@
+The encoding of style file is now specified to be utf-8
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+It has been impossible to import Matplotlib with a non UTF-8 compatible locale
+encoding because we read the style library at import time.  This change is
+formalizing and documenting the status quo so there is no deprecation period.
diff --git a/doc/api/next_api_changes/behavior/23170-JMK.rst b/doc/api/next_api_changes/behavior/23170-JMK.rst
@@ -0,0 +1,6 @@
+``get_ticklabels`` now always populates labels
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Previously `.Axis.get_ticklabels` (and `.Axes.get_xticklabels`,
+`.Axes.get_yticklabels`) would only return empty strings unless a draw had
+already been performed.  Now the ticks and their labels are updated when the
+labels are requested.
diff --git a/doc/api/next_api_changes/behavior/23188-JMK.rst b/doc/api/next_api_changes/behavior/23188-JMK.rst
@@ -0,0 +1,9 @@
+Default date limits changed to 1970-01-01 to 1970-01-02
+-------------------------------------------------------
+
+Previously the default limits for an empty axis set up for dates
+(`.Axis.axis_date`) was 2000-01-01 to 2010-01-01.  This has been
+changed to 1970-01-01 to 1970-01-02.  With the default epoch, this
+makes the numeric limit for date axes the same as for other axes
+(0.0-1.0), and users are less likely to set a locator with far too
+many ticks.
diff --git a/doc/api/next_api_changes/deprecations/21584-AL.rst b/doc/api/next_api_changes/deprecations/21584-AL.rst
@@ -0,0 +1,6 @@
+Modifications to the Groupers returned by ``get_shared_x_axes`` and ``get_shared_y_axes``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... are deprecated.  In the future, these methods will return immutable views
+on the grouper structures.  Note that previously, calling e.g. ``join()``
+would already fail to set up the correct structures for sharing axes; use
+`.Axes.sharex` or `.Axes.sharey` instead.
diff --git a/doc/api/next_api_changes/deprecations/22507-AL.rst b/doc/api/next_api_changes/deprecations/22507-AL.rst
@@ -0,0 +1,5 @@
+The *math* parameter of ``mathtext.get_unicode_index``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In math mode, ASCII hyphens (U+002D) are now replaced by unicode minus signs
+(U+2212) at the parsing stage.
diff --git a/doc/api/next_api_changes/deprecations/23045-OG.rst b/doc/api/next_api_changes/deprecations/23045-OG.rst
@@ -0,0 +1,7 @@
+``checkdep_usetex`` deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This method was only intended to disable tests in case no latex install was
+found. As such, it is considered to be private and for internal use only.
+
+Please vendor the code if you need this.
diff --git a/doc/api/next_api_changes/deprecations/23081-OG.rst b/doc/api/next_api_changes/deprecations/23081-OG.rst
@@ -0,0 +1,8 @@
+``date_ticker_factory`` deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``date_ticker_factory`` method in the `matplotlib.dates` module is
+deprecated. Instead use `~.AutoDateLocator` and `~.AutoDateFormatter` for a
+more flexible and scalable locator and formatter.
+
+If you need the exact ``date_ticker_factory`` behavior, please copy the code.
diff --git a/doc/api/next_api_changes/deprecations/23166-ES.rst b/doc/api/next_api_changes/deprecations/23166-ES.rst
@@ -0,0 +1,5 @@
+``Legend`` constructor
+~~~~~~~~~~~~~~~~~~~~~~
+
+All arguments to `.legend.Legend` other than *parent*, *handles*, and *labels*
+will become keyword-only in a future version.
diff --git a/doc/api/next_api_changes/removals/23076-GL.rst b/doc/api/next_api_changes/removals/23076-GL.rst
@@ -0,0 +1,4 @@
+Passing positional arguments to LineCollection has been removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use specific keyword argument names now.
diff --git a/doc/api/next_api_changes/removals/23077-GL.rst b/doc/api/next_api_changes/removals/23077-GL.rst
@@ -0,0 +1,4 @@
+Keyword arguments to ``gca()`` have been removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There is no replacement.
diff --git a/doc/api/next_api_changes/removals/23078-GL.rst b/doc/api/next_api_changes/removals/23078-GL.rst
@@ -0,0 +1,4 @@
+``Axis.cla()`` has been removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use `.Axis.clear()` instead.
diff --git a/doc/api/next_api_changes/removals/23079-GL.rst b/doc/api/next_api_changes/removals/23079-GL.rst
@@ -0,0 +1,5 @@
+``key_press`` and ``button_press`` have been removed from FigureManager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Trigger the events directly on the canvas using
+``canvas.callbacks.process(event.name, event)`` for key and button events.
diff --git a/doc/api/next_api_changes/removals/23093-GL.rst b/doc/api/next_api_changes/removals/23093-GL.rst
@@ -0,0 +1,50 @@
+Get/set window title methods have been removed from the canvas
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use the corresponding methods on the FigureManager if using pyplot,
+or GUI-specific methods if embedding.
+
+``ContourLabeler.get_label_coords()`` has been removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There is no replacement, it was considered an internal helper.
+
+The **return_all** keyword argument has been removed from ``gridspec.get_position()``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The **minimum_descent** has been removed from ``TextArea``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The minimum_descent is now effectively always True.
+
+Extra parameters to Axes constructor
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Parameters of the Axes constructor other than *fig* and *rect* are now keyword only.
+
+``sphinext.plot_directive.align`` has been removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use ``docutils.parsers.rst.directives.images.Image.align`` instead.
+
+``imread()`` no longer accepts URLs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Passing a URL to `~.pyplot.imread()` has been removed. Please open the URL for
+reading and directly use the Pillow API
+(``PIL.Image.open(urllib.request.urlopen(url))``, or
+``PIL.Image.open(io.BytesIO(requests.get(url).content))``) instead.
+
+Deprecated properties of widgets have been removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These include ``cids``, ``cnt``, ``observers``, ``change_observers``,
+and ``submit_observers``.
+
+Removal of methods and properties of ``Subplot``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These include ``get_geometry()``, ``change_geometry()``, ``figbox``,
+``numRows``, ``numCols``, ``update_params()``, ``is_first_row()``,
+``is_first_col()``, ``is_last_row()``, ``is_last_col()``. The subplotspec
+contains this information and can be used to replace these methods and properties.
diff --git a/doc/api/next_api_changes/removals/23237-AL.rst b/doc/api/next_api_changes/removals/23237-AL.rst
@@ -0,0 +1,4 @@
+``BoxStyle._Base`` and ``transmute`` method of boxstyles
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... have been removed.  Boxstyles implemented as classes no longer need to
+inherit from a base class.
diff --git a/doc/api/prev_api_changes/api_changes_0.65.rst b/doc/api/prev_api_changes/api_changes_0.65.rst
@@ -8,5 +8,5 @@ Changes for 0.65
   connect and disconnect
 
   Did away with the text methods for angle since they were ambiguous.
-  fontangle could mean fontstyle (obligue, etc) or the rotation of the
+  fontangle could mean fontstyle (oblique, etc) or the rotation of the
   text.  Use style and rotation instead.
diff --git a/doc/api/prev_api_changes/api_changes_0.70.rst b/doc/api/prev_api_changes/api_changes_0.70.rst
@@ -6,4 +6,4 @@ Changes for 0.70
    MplEvent factored into a base class Event and derived classes
    MouseEvent and KeyEvent
 
-   Removed definct set_measurement in wx toolbar
+   Removed defunct set_measurement in wx toolbar
diff --git a/doc/api/prev_api_changes/api_changes_0.72.rst b/doc/api/prev_api_changes/api_changes_0.72.rst
@@ -6,7 +6,7 @@ Changes for 0.72
   - Line2D, Text, and Patch copy_properties renamed update_from and
     moved into artist base class
 
-  - LineCollecitons.color renamed to LineCollections.set_color for
+  - LineCollections.color renamed to LineCollections.set_color for
     consistency with set/get introspection mechanism,
 
   - pylab figure now defaults to num=None, which creates a new figure

diff --git a/doc/api/prev_api_changes/api_changes_0.98.0.rst b/doc/api/prev_api_changes/api_changes_0.98.0.rst
@@ -181,7 +181,7 @@ The ``Polar`` class has moved to :mod:`matplotlib.projections.polar`.
 .. [3] :meth:`matplotlib.axes.Axes.set_position` now accepts either
    four scalars or a :class:`matplotlib.transforms.Bbox` instance.
 
-.. [4] Since the recfactoring allows for more than two scale types
+.. [4] Since the refactoring allows for more than two scale types
    ('log' or 'linear'), it no longer makes sense to have a toggle.
    ``Axes.toggle_log_lineary()`` has been removed.