Merge branch 'matplotlib:main' into axes-bar-unit-test-for-issue-26864

Author: kots14

.github/workflows/cibuildwheel.yml

@@ -137,53 +137,39 @@ jobs:
           path: dist/
 
       - name: Build wheels for CPython 3.12
-        uses: pypa/cibuildwheel@7da7df1efc530f07d1945c00934b8cfd34be0d50 # v2.16.1
+        uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp312-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          # Remove this once NumPy with Python 3.12 wheels is not pre-release.
-          CIBW_BEFORE_BUILD: >-
-            pip install "meson-python>=0.13.1" ninja "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" &&
-            pip install --pre "numpy>=1.25" &&
-            rm -rf {package}/build
-          CIBW_BEFORE_BUILD_WINDOWS: >-
-            pip install delvewheel "meson-python>=0.13.1" ninja "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" &&
-            pip install --pre "numpy>=1.25" &&
-            rm -rf {package}/build
-          CIBW_ENVIRONMENT: PIP_NO_BUILD_ISOLATION=0
-          # Remove this once contourpy has Python 3.12 wheels.
-          CIBW_BEFORE_TEST: >-
-            pip install "meson>=1.2.0" "meson-python>=0.13.1" "ninja" "pybind11>=2.10.4" &&
-            pip install --pre "numpy>=1.25"
 
       - name: Build wheels for CPython 3.11
-        uses: pypa/cibuildwheel@7da7df1efc530f07d1945c00934b8cfd34be0d50 # v2.16.1
+        uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.10
-        uses: pypa/cibuildwheel@7da7df1efc530f07d1945c00934b8cfd34be0d50 # v2.16.1
+        uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.9
-        uses: pypa/cibuildwheel@7da7df1efc530f07d1945c00934b8cfd34be0d50 # v2.16.1
+        uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp39-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for PyPy
-        uses: pypa/cibuildwheel@7da7df1efc530f07d1945c00934b8cfd34be0d50 # v2.16.1
+        uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:

.github/workflows/reviewdog.yml

@@ -65,9 +65,7 @@ jobs:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -o pipefail
-          # The --ignore-missing-imports can be removed when typed cycler is released and used
           mypy --config pyproject.toml lib/matplotlib \
-             --ignore-missing-imports \
              --follow-imports silent | \
             reviewdog -f=mypy -name=mypy \
               -tee -reporter=github-check -filter-mode nofilter

.github/workflows/tests.yml

@@ -77,9 +77,8 @@ jobs:
             pyside6-ver: '!=6.5.1'
             extra-requirements: '-r requirements/testing/extra.txt'
           - os: ubuntu-22.04
-            python-version: '3.12-dev'
+            python-version: '3.12'
             pyside6-ver: '!=6.5.1'
-            pre: true
           - os: macos-latest
             python-version: 3.9
             # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
@@ -196,10 +195,8 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel
 
           # Install pre-release versions during our weekly upcoming dependency tests.
-          # Also install for 3.12 to get working NumPy (remove when 1.26 is released)
-          if [[ "${{ github.event_name == 'schedule' &&
-                     matrix.name-suffix != '(Minimum Versions)' }}" = "true"
-                || "${{ matrix.pre }}" = "true" ]]; then
+          if [[ "${{ github.event_name }}" == 'schedule'
+                && "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
             PRE="--pre"
           fi
 
@@ -241,7 +238,7 @@ jobs:
             echo 'PyQt5 is available' ||
             echo 'PyQt5 is not available'
           if [[ "${{ runner.os }}" != 'macOS'
-                && "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
+                && "${{ matrix.python-version }}" != '3.12' ]]; then
             python -mpip install --upgrade pyside2${{ matrix.pyside2-ver }} &&
               python -c 'import PySide2.QtCore' &&
               echo 'PySide2 is available' ||
@@ -254,14 +251,14 @@ jobs:
               echo 'PyQt6 is not available'
           fi
           if [[ "${{ runner.os }}" != 'macOS'
-                && "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
+                && "${{ matrix.python-version }}" != '3.12' ]]; then
             python -mpip install --upgrade pyside6${{ matrix.pyside6-ver }} &&
               python -c 'import PySide6.QtCore' &&
               echo 'PySide6 is available' ||
               echo 'PySide6 is not available'
           fi
 
-          if [[ "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
+          if [[ "${{ matrix.python-version }}" != '3.12' ]]; then
             python -mpip install --upgrade \
               -f "https://extras.wxpython.org/wxPython4/extras/linux/gtk3/${{ matrix.os }}" \
               wxPython &&

.pre-commit-config.yaml

@@ -26,6 +26,23 @@ repos:
       - id: no-commit-to-branch #default is master and main
       - id: trailing-whitespace
         exclude_types: [svg]
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.1.1
+    hooks:
+      - id: mypy
+        additional_dependencies: [
+          pandas-stubs,
+          types-pillow,
+          types-python-dateutil,
+          types-psutil,
+          types-docutils,
+          types-PyYAML]
+        args: [
+          "--config-file=pyproject.toml",
+          "lib/matplotlib"
+          ]
+        files: lib/matplotlib #only run when files in lib/matplotlib are changed
+        pass_filenames: false
   - repo: https://github.com/pycqa/flake8
     rev: 6.0.0
     hooks:

doc/api/figure_api.rst

@@ -306,3 +306,8 @@ FigureBase parent class
 =======================
 
 .. autoclass:: FigureBase
+
+Helper functions
+================
+
+.. autofunction:: figaspect

doc/api/next_api_changes/development/27012-ES.rst

@@ -0,0 +1,7 @@
+Extensions require C++17
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Matplotlib now requires a compiler that supports C++17 in order to build its extensions.
+According to `SciPy's analysis
+<https://docs.scipy.org/doc/scipy/dev/toolchain.html#c-language-standards>`_, this
+should be available on all supported platforms.

doc/api/next_api_changes/removals/26889-GC.rst

@@ -0,0 +1,3 @@
+Removing Deprecated API SimpleEvent
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``matplotlib.patches.ConnectionStyle._Base.SimpleEvent``

doc/devel/dependencies.rst

@@ -233,7 +233,7 @@ in your target environment manually:
 C++ compiler
 ------------
 
-Matplotlib requires a C++ compiler that supports C++11, and each platform has a
+Matplotlib requires a C++ compiler that supports C++17, and each platform has a
 development environment that must be installed before a compiler can be installed.
 
 .. tab-set::
@@ -277,18 +277,18 @@ Xcode, VS Code or Linux package manager. Choose **one** compiler from this list:
      - platforms
      - notes
    * - GCC
-     - **4.8.1**
+     - **7.2**
      - Linux, macOS, Windows
-     - `gcc 4.8.1 <https://gcc.gnu.org/projects/cxx-status.html#cxx11>`_,
+     - `gcc 7.2 <https://gcc.gnu.org/projects/cxx-status.html#cxx17>`_,
        `GCC: Binaries <https://gcc.gnu.org/install/binaries.html>`_,
    * - Clang (LLVM)
-     - **3.3**
+     - **5**
      - Linux, macOS
-     - `clang 3.3 <https://clang.llvm.org/cxx_status.html>`_, `LLVM <https://releases.llvm.org/download.html>`_
+     - `clang 5 <https://clang.llvm.org/cxx_status.html>`_, `LLVM <https://releases.llvm.org/download.html>`_
    * - MSVC++
-     - **14.0**
+     - **16.0**
      - Windows
-     - `Visual Studio 2015 C++ <https://docs.microsoft.com/en-us/cpp/overview/visual-cpp-language-conformance?view=msvc-140>`_
+     - `Visual Studio 2019 C++ <https://docs.microsoft.com/en-us/cpp/overview/visual-cpp-language-conformance?view=msvc-160>`_
 
 
 

doc/users/prev_whats_new/whats_new_3.8.0.rst

@@ -327,6 +327,10 @@ This allows users to set the location of the legend in a more flexible and consi
 Mathtext improvements
 =====================
 
+Improvements are to Mathtext, Matplotlib's native TeX-like mathematics parser
+(see :ref:`mathtext`, not to be confused with Matplotlib using LaTeX directly:
+:ref:`usetex`).
+
 Boldsymbol mathtext command ``\boldsymbol``
 -------------------------------------------
 

doc/users/resources/index.rst

@@ -71,10 +71,6 @@ Videos
 Tutorials
 =========
 
-
-* `The Python Graph Gallery <https://www.python-graph-gallery.com>`_
-  by Yan Holtz
-
 * `Matplotlib tutorial <https://www.labri.fr/perso/nrougier/teaching/matplotlib/>`_
   by Nicolas P. Rougier
 
@@ -85,3 +81,13 @@ Tutorials
 * `Beyond the Basics: Data Visualization in Python
   <https://github.com/stefmolin/python-data-viz-workshop>`_
   by Stefanie Molin
+
+=========
+Galleries
+=========
+
+* `Past winners for JDH plotting contest <https://jhepc.github.io/gallery.html>`_
+  by Nelle Varoquaux
+
+* `The Python Graph Gallery <https://www.python-graph-gallery.com>`_
+  by Yan Holtz