Merge pull request matplotlib#28711 from QuLogic/merge-39x

Merge branch v3.9.x into main

Author: tacaswell

.github/workflows/cibuildwheel.yml

@@ -100,7 +100,15 @@ jobs:
       CIBW_AFTER_BUILD: >-
         twine check {wheel} &&
         python {package}/ci/check_wheel_licenses.py {wheel}
-      CIBW_CONFIG_SETTINGS: setup-args="--vsenv"
+      # On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
+      # MinGW on PATH that would be picked otherwise), switch to a static build for
+      # runtimes, but use dynamic linking for `VCRUNTIME140.dll`, `VCRUNTIME140_1.dll`,
+      # and the UCRT. This avoids requiring specific versions of `MSVCP140.dll`, while
+      # keeping shared state with the rest of the Python process/extensions.
+      CIBW_CONFIG_SETTINGS_WINDOWS: >-
+        setup-args="--vsenv"
+        setup-args="-Db_vscrt=mt"
+        setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
       CIBW_SKIP: "*-musllinux_aarch64"
       CIBW_TEST_COMMAND: >-
@@ -144,7 +152,6 @@ jobs:
           CIBW_SKIP: "cp313t-win_amd64 *-musllinux_aarch64"
           CIBW_BUILD_FRONTEND:
             "pip; args: --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
-          CIBW_PRERELEASE_PYTHONS: true
           CIBW_FREE_THREADED_SUPPORT: true
           # No free-threading wheels available for aarch64 on Pillow.
           CIBW_TEST_SKIP: "cp313t-manylinux_aarch64"

.github/workflows/tests.yml

@@ -158,7 +158,13 @@ jobs:
             ;;
           macOS)
             brew update
-            brew install ccache ghostscript gobject-introspection gtk4 ninja
+            export HOMEBREW_NO_INSTALL_UPGRADE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+            brew install ccache ghostscript ninja
+            # The macOS 12 images have an older Python, and this causes homebrew to generate conflicts.
+            # We'll just skip GTK for now, to not pull in Python updates.
+            if [[ "${{ matrix.os }}" = macos-14 ]]; then
+              brew install gobject-introspection gtk4
+            fi
             brew install --cask font-noto-sans-cjk inkscape
             ;;
           esac

azure-pipelines.yml

@@ -111,6 +111,7 @@ stages:
                 ;;
               Darwin)
                 brew update
+                export HOMEBREW_NO_INSTALL_UPGRADE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
                 brew install --cask xquartz
                 brew install ccache ffmpeg imagemagick mplayer ninja pkg-config
                 brew install --cask font-noto-sans-cjk-sc

doc/_static/switcher.json

@@ -1,7 +1,7 @@
 [
     {
         "name": "3.9 (stable)",
-        "version": "3.9.1",
+        "version": "3.9.2",
         "url": "https://matplotlib.org/stable/",
         "preferred": true
     },

doc/_static/zenodo_cache/13308876.svg

@@ -0,0 +1,16 @@
+API Changes for 3.9.2
+=====================
+
+Development
+-----------
+
+Windows wheel runtime bundling made static
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In 3.7.0, the MSVC runtime DLL was bundled in wheels to enable importing Matplotlib on
+systems that do not have it installed. However, this could cause inconsistencies with
+other wheels that did the same, and trigger random crashes depending on import order. See
+`this issue <https://github.com/matplotlib/matplotlib/issues/28551>`_ for further
+details.
+
+Since 3.9.2, wheels now bundle the MSVC runtime DLL statically to avoid such issues.

doc/api/prev_api_changes/api_changes_3.9.2.rst

@@ -32,6 +32,9 @@ By version
 .. START OF AUTOGENERATED
 
 
+v3.9.2
+   .. image:: ../_static/zenodo_cache/13308876.svg
+      :target:  https://doi.org/10.5281/zenodo.13308876
 v3.9.1
    .. image:: ../_static/zenodo_cache/12652732.svg
       :target:  https://doi.org/10.5281/zenodo.12652732