matplotlib · dstansby · Aug 28, 2021 · Aug 28, 2021 · Jun 25, 2021 · Jun 25, 2021
diff --git a/.flake8 b/.flake8
@@ -120,11 +120,15 @@ per-file-ignores =
     examples/style_sheets/plot_solarizedlight2.py: E501
     examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
     examples/text_labels_and_annotations/custom_legends.py: E402
-    examples/ticks_and_spines/date_concise_formatter.py: E402
+    examples/ticks/date_concise_formatter.py: E402
     examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
     examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
-    examples/user_interfaces/gtk_spreadsheet_sgskip.py: E402
+    examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py: E402
+    examples/user_interfaces/embedding_in_gtk4_sgskip.py: E402
+    examples/user_interfaces/gtk3_spreadsheet_sgskip.py: E402
+    examples/user_interfaces/gtk4_spreadsheet_sgskip.py: E402
     examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
-    examples/user_interfaces/pylab_with_gtk_sgskip.py: E402
+    examples/user_interfaces/pylab_with_gtk3_sgskip.py: E402
+    examples/user_interfaces/pylab_with_gtk4_sgskip.py: E402
     examples/user_interfaces/toolmanager_sgskip.py: E402
     examples/userdemo/pgf_preamble_sgskip.py: E402
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms
-github: [numfocus]
+github: [matplotlib, numfocus]
 custom: https://numfocus.org/donate-to-matplotlib
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -15,6 +15,7 @@ jobs:
     env:
       min-numpy-version: "1.17.3"
       min-numpy-hash: "b6/d6/be8f975f5322336f62371c9abeb936d592c98c047ad63035f1b38ae08efe"
+      CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
     strategy:
       matrix:
         os: [ubuntu-18.04, windows-latest, macos-latest]

diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -212,3 +212,11 @@ table.property-table th,
 table.property-table td {
     padding: 4px 10px;
 }
+
+.donate-button {
+    margin: 1em 0;
+}
+
+.sphinxsidebarwrapper {
+    margin: 0 1em;
+}
diff --git a/doc/_templates/cheatsheet_sidebar.html b/doc/_templates/cheatsheet_sidebar.html
@@ -0,0 +1,9 @@
+
+<div class="sphinxsidebarwrapper">
+  <h3>Matplotlib cheatsheets</h3>
+  <a href="https://github.com/matplotlib/cheatsheets#cheatsheets">
+    <img src="_static/mpl_cheatsheet1.png"
+         alt="Matplotlib cheatsheets"
+         srcset="_static/mpl_cheatsheet1.png 1x, _static/mpl_cheatsheet1_2x.png 2x"/>
+  </a>
+</div>
diff --git a/doc/_templates/donate_sidebar.html b/doc/_templates/donate_sidebar.html
@@ -1,6 +1,8 @@
 
 
 
-<div id="sidebar-donations">
-  <a href="https://numfocus.org/donate-to-matplotlib" target="_blank"> <span class="mpl-button donate_button" >Support Matplotlib</span></a>
+<div id="sidebar-donations" class="donate-button">
+  <a href="https://numfocus.org/donate-to-matplotlib" target="_blank">
+    <span class="mpl-button" >Support Matplotlib</span>
+  </a>
 </div>
diff --git a/doc/_templates/mpl_nav_bar.html b/doc/_templates/mpl_nav_bar.html
@@ -0,0 +1,24 @@
+<ul id="navbar-main-elements" class="navbar-nav">
+
+  <li class="nav-item">
+    <a class="reference internal nav-link" href="{{ pathto('plot_types/index') }}">Plot Types</a>
+  </li>
+  <li class="nav-item">
+    <a class="reference internal nav-link" href="{{ pathto('gallery/index') }}">Examples</a>
+  </li>
+  <li class="nav-item">
+    <a class="reference internal nav-link" href="{{ pathto('tutorials/index') }}">Tutorials</a>
+  </li>
+  <li class="nav-item">
+    <a class="reference internal nav-link" href="{{ pathto('api/index') }}">Reference</a>
+  </li>
+  <li class="nav-item">
+    <a class="reference internal nav-link" href="{{ pathto('contents') }}">Usage Guide</a>
+  </li>
+  <li class="nav-item">
+    <a class="reference internal nav-link" href="{{ pathto('devel/index') }}">Develop</a>
+  </li>
+  <li class="nav-item">
+    <a class="reference internal nav-link" href="{{ pathto('users/release_notes') }}">Release Notes</a>
+  </li>
+</ul>
diff --git a/doc/_templates/sidebar_versions.html b/doc/_templates/sidebar_versions.html
@@ -36,12 +36,3 @@
 getSnippet('other_versions', '/versions.html');
 </script>
 </div>
-
-<div class="sphinxsidebarwrapper">
-  <h3>Matplotlib cheatsheets</h3>
-  <a href="https://github.com/matplotlib/cheatsheets#cheatsheets">
-    <img src="_static/mpl_cheatsheet1.png"
-         alt="Matplotlib cheatsheets"
-         srcset="_static/mpl_cheatsheet1.png 1x, _static/mpl_cheatsheet1_2x.png 2x"/>
-  </a>
-</div>
diff --git a/doc/api/backend_gtk4_api.rst b/doc/api/backend_gtk4_api.rst
@@ -0,0 +1,16 @@
+**NOTE** These backends are not documented here, to avoid adding a dependency
+to building the docs.
+
+.. redirect-from:: /api/backend_gtk4agg_api
+.. redirect-from:: /api/backend_gtk4cairo_api
+
+
+:mod:`matplotlib.backends.backend_gtk4agg`
+==========================================
+
+.. module:: matplotlib.backends.backend_gtk4agg
+
+:mod:`matplotlib.backends.backend_gtk4cairo`
+============================================
+
+.. module:: matplotlib.backends.backend_gtk4cairo
diff --git a/doc/api/index.rst b/doc/api/index.rst
@@ -101,21 +101,6 @@ Alphabetical list of modules:
    widgets_api.rst
    _api_api.rst
    _enums_api.rst
-
-Toolkits
---------
-
-:ref:`toolkits-index` are collections of application-specific functions that extend
-Matplotlib. The following toolkits are included:
-
-.. toctree::
-   :hidden:
-
-   toolkits/index.rst
-
-.. toctree::
-   :maxdepth: 1
-
    toolkits/mplot3d.rst
    toolkits/axes_grid1.rst
    toolkits/axisartist.rst

diff --git a/doc/api/index_backend_api.rst b/doc/api/index_backend_api.rst
@@ -10,6 +10,7 @@
    backend_agg_api.rst
    backend_cairo_api.rst
    backend_gtk3_api.rst
+   backend_gtk4_api.rst
    backend_nbagg_api.rst
    backend_pdf_api.rst
    backend_pgf_api.rst

diff --git a/doc/api/next_api_changes/behavior/20962-DS.rst b/doc/api/next_api_changes/behavior/20962-DS.rst
@@ -0,0 +1,16 @@
+Unit converters can now support units in Scalar Mappables
+---------------------------------------------------------
+
+`~.cm.ScalarMappable` can now contain data with units.
+For this to be supported by third-party `~.units.ConversionInterface`s,
+the `~.units.ConversionInterface.default_units` and
+`~.units.ConversionInterface.convert` methods must allow for the *axis*
+argument to be a `~.cm.ScalarMappable` object, and
+`~.units.ConversionInterface.convert` must be able to convert data of more than
+one dimension (e.g. when plotting images the data is 2D).
+
+The ``Quiver`` ``units`` property is renamed ``arrow_units``
+------------------------------------------------------------
+This is to clarify the meaning of this property, and enable support for color
+mapped data with units in the future. The corresponding keyword argument to
+`~.quiver.Quiver` is also renamed.
diff --git a/doc/api/next_api_changes/behavior/21031-AL.rst b/doc/api/next_api_changes/behavior/21031-AL.rst
@@ -0,0 +1,3 @@
+Setting invalid ``rcParams["date.converter"]`` now raises ValueError
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Previously, invalid values would be ignored with a UserWarning.
diff --git a/doc/api/next_api_changes/deprecations/20995-AL.rst b/doc/api/next_api_changes/deprecations/20995-AL.rst
@@ -0,0 +1,3 @@
+``backend_gtk3.icon_filename`` and ``backend_gtk3.window_icon``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... are deprecated with no replacement.
diff --git a/doc/api/toolkits/index.rst b/doc/api/toolkits/index.rst
diff --git a/doc/api/toolkits/mplot3d.rst b/doc/api/toolkits/mplot3d.rst
@@ -1,8 +1,32 @@
-.. _toolkit_mplot3d-api:
+.. _toolkit_mplot3d-index:
+.. currentmodule:: mpl_toolkits.mplot3d
+
+************************
+``mpl_toolkits.mplot3d``
+************************
+
+The mplot3d toolkit adds simple 3D plotting capabilities (scatter, surface,
+line, mesh, etc.) to Matplotlib by supplying an Axes object that can create
+a 2D projection of a 3D scene.  The resulting graph will have the same look
+and feel as regular 2D plots.  Not the fastest or most feature complete 3D
+library out there, but it ships with Matplotlib and thus may be a lighter
+weight solution for some use cases.
+
+See the :doc:`mplot3d tutorial </tutorials/toolkits/mplot3d>` for
+more information.
+
+.. image:: /_static/demo_mplot3d.png
+   :align: center
+
+The interactive backends also provide the ability to rotate and zoom the 3D
+scene.  One can rotate the 3D scene by simply clicking-and-dragging the scene.
+Zooming is done by right-clicking the scene and dragging the mouse up and down
+(unlike 2D plots, the toolbar zoom button is not used).
+
+.. toctree::
+   :maxdepth: 2
 
-***********
-mplot3d API
-***********
+   mplot3d/faq.rst
 
 .. note::
    `.pyplot` cannot be used to add content to 3D plots, because its function

diff --git a/doc/api/toolkits/mplot3d/index.rst b/doc/api/toolkits/mplot3d/index.rst
diff --git a/doc/conf.py b/doc/conf.py
@@ -71,12 +71,15 @@
     'sphinxext.skip_deprecated',
     'sphinxext.redirect_from',
     'sphinx_copybutton',
+    'sphinx_panels',
 ]
 
 exclude_patterns = [
     'api/prev_api_changes/api_changes_*/*',
 ]
 
+panels_add_bootstrap_css = False
+
 
 def _check_dependencies():
     names = {
@@ -312,8 +315,9 @@ def _check_dependencies():
             "url": "https://twitter.com/matplotlib/",
             "icon": "fab fa-twitter-square",
         },
-
     ],
+    "show_prev_next": False,
+    "navbar_center": ["mpl_nav_bar.html"],
 }
 include_analytics = False
 if include_analytics:
@@ -341,8 +345,10 @@ def _check_dependencies():
 # Custom sidebar templates, maps page names to templates.
 html_sidebars = {
     "index": [
+        'search-field.html',
         # 'sidebar_announcement.html',
         "sidebar_versions.html",
+        "cheatsheet_sidebar.html",
         "donate_sidebar.html",
     ],
     # '**': ['localtoc.html', 'pagesource.html']

diff --git a/doc/contents.rst b/doc/contents.rst
@@ -1,4 +1,4 @@
-
+.. _complete_sitemap:
 
 Contents
 ========
@@ -15,13 +15,10 @@ Contents
    :maxdepth: 2
 
    users/installing.rst
-   plot_types/index.rst
-   gallery/index.rst
-   tutorials/index.rst
-   api/index.rst
    users/index.rst
+   users/backmatter.rst
    devel/index.rst
-   Third-party packages <https://matplotlib.org/mpl-third-party/>
+   users/release_notes.rst
 
 .. only:: html
 

diff --git a/doc/devel/MEP/MEP15.rst b/doc/devel/MEP/MEP15.rst
@@ -1,6 +1,6 @@
-==========================================================================
- MEP15 - Fix axis autoscaling when limits are specified for one axis only
-==========================================================================
+=========================================================================
+ MEP15: Fix axis autoscaling when limits are specified for one axis only
+=========================================================================
 
 .. contents::
    :local:

diff --git a/doc/devel/MEP/MEP24.rst b/doc/devel/MEP/MEP24.rst
@@ -1,5 +1,5 @@
 =======================================
- MEP24: negative radius in polar plots
+ MEP24: Negative radius in polar plots
 =======================================
 
 .. contents::

diff --git a/doc/devel/MEP/MEP27.rst b/doc/devel/MEP/MEP27.rst
@@ -1,5 +1,5 @@
 ======================================
- MEP27: decouple pyplot from backends
+ MEP27: Decouple pyplot from backends
 ======================================
 
 .. contents::

diff --git a/doc/devel/dependencies.rst b/doc/devel/dependencies.rst
@@ -42,9 +42,9 @@ and the capabilities they provide.
 
 * Tk_ (>= 8.4, != 8.6.0 or 8.6.1) [#]_: for the Tk-based backends.
 * PyQt6_ (>= 6.1), PySide6_, PyQt5_, or PySide2_: for the Qt-based backends.
-* PyGObject_: for the GTK3-based backends [#]_.
+* PyGObject_: for the GTK-based backends [#]_.
 * wxPython_ (>= 4) [#]_: for the wx-based backends.
-* pycairo_ (>= 1.11.0) or cairocffi_ (>= 0.8): for the GTK3 and/or cairo-based
+* pycairo_ (>= 1.11.0) or cairocffi_ (>= 0.8): for the GTK and/or cairo-based
   backends.
 * Tornado_: for the WebAgg backend.
 

diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -244,7 +244,7 @@ The correct target folder can be found using::
     python -c "import matplotlib.tests; print(matplotlib.tests.__file__.rsplit('/', 1)[0])"
 
 An analogous copying of :file:`lib/mpl_toolkits/tests/baseline_images`
-is necessary for testing the :ref:`toolkits`.
+is necessary for testing ``mpl_toolkits``.
 
 Run the tests
 ^^^^^^^^^^^^^