Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6ff7f40

Browse files
tacaswelltacaswell
authored
Merge pull request #28711 from QuLogic/merge-39x
Merge branch v3.9.x into main
2 parents 659792c + 36c04a4 commit 6ff7f40

14 files changed

Lines changed: 351 additions & 176 deletions

File tree

‎.github/workflows/cibuildwheel.yml‎

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

‎.github/workflows/tests.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,13 @@ jobs:
158158
;;
159159
macOS)
160160
brew update
161-
brew install ccache ghostscript gobject-introspection gtk4 ninja
161+
export HOMEBREW_NO_INSTALL_UPGRADE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
162+
brew install ccache ghostscript ninja
163+
# The macOS 12 images have an older Python, and this causes homebrew to generate conflicts.
164+
# We'll just skip GTK for now, to not pull in Python updates.
165+
if [[ "${{ matrix.os }}" = macos-14 ]]; then
166+
brew install gobject-introspection gtk4
167+
fi
162168
brew install --cask font-noto-sans-cjk inkscape
163169
;;
164170
esac

‎azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ stages:
111111
;;
112112
Darwin)
113113
brew update
114+
export HOMEBREW_NO_INSTALL_UPGRADE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
114115
brew install --cask xquartz
115116
brew install ccache ffmpeg imagemagick mplayer ninja pkg-config
116117
brew install --cask font-noto-sans-cjk-sc

‎doc/_static/switcher.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "3.9 (stable)",
4-
"version": "3.9.1",
4+
"version": "3.9.2",
55
"url": "https://matplotlib.org/stable/",
66
"preferred": true
77
},

‎doc/_static/zenodo_cache/13308876.svg‎

Lines changed: 35 additions & 0 deletions
Loading

‎doc/api/prev_api_changes/api_changes_3.9.2.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
API Changes for 3.9.2
2+
=====================
3+
4+
Development
5+
-----------
6+
7+
Windows wheel runtime bundling made static
8+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9+
10+
In 3.7.0, the MSVC runtime DLL was bundled in wheels to enable importing Matplotlib on
11+
systems that do not have it installed. However, this could cause inconsistencies with
12+
other wheels that did the same, and trigger random crashes depending on import order. See
13+
`this issue <https://github.com/matplotlib/matplotlib/issues/28551>`_ for further
14+
details.
15+
16+
Since 3.9.2, wheels now bundle the MSVC runtime DLL statically to avoid such issues.

‎doc/project/citing.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ By version
3232
.. START OF AUTOGENERATED
3333
3434
35+
v3.9.2
36+
.. image:: ../_static/zenodo_cache/13308876.svg
37+
:target: https://doi.org/10.5281/zenodo.13308876
3538
v3.9.1
3639
.. image:: ../_static/zenodo_cache/12652732.svg
3740
:target: https://doi.org/10.5281/zenodo.12652732

0 commit comments

Comments
 (0)