matplotlib · jondoesntgit · Aug 27, 2021 · Aug 27, 2021 · Aug 28, 2021 · Aug 28, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -105,6 +105,13 @@ commands:
       - run:
           name: Install Matplotlib
           command: python -m pip install --user -ve .
+      - save_cache:
+          key: build-deps-1
+          paths:
+            # FreeType 2.6.1 tarball.
+            - ~/.cache/matplotlib/0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
+            # Qhull 2020.2 tarball.
+            - ~/.cache/matplotlib/b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e
 
   doc-build:
     steps:

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]
@@ -60,6 +61,18 @@ jobs:
           CIBW_BUILD: "cp37-* cp38-*"
           CIBW_ARCHS: aarch64
 
+      - name: Build wheels for CPython 3.10
+        run: |
+          python -m cibuildwheel --output-dir dist
+        if: matrix.os != 'macos-latest'
+        env:
+          CIBW_BUILD: "cp310-*"
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
+          CIBW_BEFORE_BUILD: pip install certifi numpy==1.21.2
+          MPL_DISABLE_FH4: "yes"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
+
       - name: Build wheels for CPython 3.9
         run: |
           python -m cibuildwheel --output-dir dist

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -171,37 +171,38 @@ jobs:
           # (sometimes, the install appears to be successful but shared
           # libraries cannot be loaded at runtime, so an actual import is a
           # better check).
-          if [[ "${{ runner.os }}" != 'macOS' ]]; then
-            # PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
-             python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
-               python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
-               echo 'PyGObject is available' ||
-               echo 'PyGObject is not available'
+          # PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
+           python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
+             python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
+             echo 'PyGObject is available' ||
+             echo 'PyGObject is not available'
 
-            # There are no functioning wheels available for OSX 10.12 (as of
-            # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
-            # pyside2 (the latest version (5.13.2) with 10.12 wheels has a
-            # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
-            python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
-              python -c 'import PyQt5.QtCore' &&
-              echo 'PyQt5 is available' ||
-              echo 'PyQt5 is not available'
+          # There are no functioning wheels available for OSX 10.12 (as of
+          # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
+          # pyside2 (the latest version (5.13.2) with 10.12 wheels has a
+          # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
+          python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
+            python -c 'import PyQt5.QtCore' &&
+            echo 'PyQt5 is available' ||
+            echo 'PyQt5 is not available'
+          if [[ "${{ runner.os }}" != 'macOS' ]]; then
             python -mpip install --upgrade pyside2 &&
               python -c 'import PySide2.QtCore' &&
               echo 'PySide2 is available' ||
               echo 'PySide2 is not available'
-            # Qt6 crashes on Github's ubuntu 18.04 runner.
-            if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
-              python -mpip install --upgrade pyqt6 &&
-                python -c 'import PyQt6.QtCore' &&
-                echo 'PyQt6 is available' ||
-                echo 'PyQt6 is not available'
-              python -mpip install --upgrade pyside6 &&
-                python -c 'import PySide6.QtCore' &&
-                echo 'PySide6 is available' ||
-                echo 'PySide6 is not available'
-            fi
           fi
+          # Qt6 crashes on Github's ubuntu 18.04 runner.
+          if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
+            python -mpip install --upgrade pyqt6 &&
+              python -c 'import PyQt6.QtCore' &&
+              echo 'PyQt6 is available' ||
+              echo 'PyQt6 is not available'
+            python -mpip install --upgrade pyside6 &&
+              python -c 'import PySide6.QtCore' &&
+              echo 'PySide6 is available' ||
+              echo 'PySide6 is not available'
+          fi
+
           python -mpip install --upgrade \
             -f "https://extras.wxpython.org/wxPython4/extras/linux/gtk3/${{ matrix.os }}" \
             wxPython &&

diff --git a/.gitignore b/.gitignore
@@ -72,6 +72,7 @@ doc/plot_types
 doc/pyplots/tex_demo.png
 doc/tutorials
 lib/dateutil
+examples/*/*.bmp
 examples/*/*.eps
 examples/*/*.pdf
 examples/*/*.png

diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -207,8 +207,27 @@ does not float with it.
 
 }
 
+/* slightly reduce horizontal margin compared to gallery.css to
+ * get four columns of thumbnails in the pydata-sphinx-theme. */
+.sphx-glr-thumbcontainer {
+    margin: 5px 2px;
+}
+
+/* workaround: the default padding decenters the image inside the frame */
+.sphx-glr-thumbcontainer .figure {
+    padding: 0;
+}
 
 table.property-table th,
 table.property-table td {
     padding: 4px 10px;
 }
+
+.sidebar-cheatsheets, .sidebar-donate {
+    margin: 2.75rem 0;
+}
+
+.sidebar-donate .mpl-button {
+    /* fix width to width of cheatsheet */
+    width: 210px;
+}
diff --git a/doc/_templates/cheatsheet_sidebar.html b/doc/_templates/cheatsheet_sidebar.html
@@ -0,0 +1,9 @@
+
+<div class="sidebar-cheatsheets">
+  <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 class="sidebar-donate">
+  <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/19515-GL.rst b/doc/api/next_api_changes/behavior/19515-GL.rst
@@ -0,0 +1,10 @@
+Colorbars now have pan and zoom functionality
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Interactive plots with colorbars can now be zoomed and panned on
+the colorbar axis. This adjusts the *vmin* and *vmax* of the
+``ScalarMappable`` associated with the colorbar. This is currently
+only enabled for continuous norms. Norms used with contourf and
+categoricals, such as ``BoundaryNorm`` and ``NoNorm``, have the
+interactive capability disabled by default. ``cb.ax.set_navigate()``
+can be used to set whether a colorbar axes is interactive or not.
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/behavior/21038-DS.rst b/doc/api/next_api_changes/behavior/21038-DS.rst
@@ -0,0 +1,4 @@
+hexbin with a log norm
+----------------------
+`~.axes.Axes.hexbin` no longer  (incorrectly) adds 1 to every bin value if a
+log norm is being used.
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/next_api_changes/deprecations/21056-AL.rst b/doc/api/next_api_changes/deprecations/21056-AL.rst
@@ -0,0 +1,3 @@
+Calling ``MarkerStyle()`` with no arguments or ``MarkerStyle(None)``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... is deprecated; use ``MarkerStyle("")`` to construct an empty marker style.
diff --git a/doc/api/next_api_changes/removals/20990-AL.rst b/doc/api/next_api_changes/removals/20990-AL.rst
@@ -0,0 +1,4 @@
+Support for passing tool names to ``ToolManager.add_tool``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... has been removed.  The second parameter to add_tool must now always be a
+tool class.
diff --git a/doc/api/pyplot_summary.rst b/doc/api/pyplot_summary.rst
@@ -29,4 +29,5 @@ For a more in-depth look at colormaps, see the
 
 .. currentmodule:: matplotlib.pyplot
 
-.. autofunction:: colormaps
+.. autodata:: colormaps
+   :no-value:
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