From 9d3555c37e888a419105ec177ebb6d8aaebf306f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 21 Dec 2025 22:39:19 +1100 Subject: [PATCH 1/3] Test Windows Server 2022 --- .github/workflows/test-windows.yml | 5 +++-- docs/installation/platform-support.rst | 4 ++-- winbuild/README.md | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 3450de355..7afafe07c 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -31,15 +31,16 @@ env: jobs: build: - runs-on: windows-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: python-version: ["pypy3.11", "3.11", "3.12", "3.13", "3.14", "3.15"] architecture: ["x64"] + os: ["windows-latest"] include: # Test the oldest Python on 32-bit - - { python-version: "3.10", architecture: "x86" } + - { python-version: "3.10", architecture: "x86", os: "windows-2022" } timeout-minutes: 45 diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 17e38719a..ee70d8401 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -53,8 +53,8 @@ These platforms are built and tested for every change. | | | s390x | +----------------------------------+----------------------------+---------------------+ | Windows Server 2022 | 3.10 | x86 | -| +----------------------------+---------------------+ -| | 3.11, 3.12, 3.13, 3.14, | x86-64 | ++----------------------------------+----------------------------+---------------------+ +| Windows Server 2025 | 3.11, 3.12, 3.13, 3.14, | x86-64 | | | PyPy3 | | | +----------------------------+---------------------+ | | 3.12 (MinGW) | x86-64 | diff --git a/winbuild/README.md b/winbuild/README.md index db71f094e..b1c9262c2 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -11,7 +11,8 @@ For more extensive info, see the [Windows build instructions](build.rst). * Requires Microsoft Visual Studio 2017 or newer with C++ component. * Requires NASM for libjpeg-turbo, a required dependency when using this script. * Requires CMake 3.15 or newer (available as Visual Studio component). -* Tested on Windows Server 2022 with Visual Studio 2022 Enterprise (GitHub Actions). +* Tested on Windows Server 2025 and 2022 with Visual Studio 2022 Enterprise (GitHub + Actions). Here's an example script to build on Windows: From 9dd756f9fe574ab2b3c97585f299600582551310 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 22 Dec 2025 09:33:28 +1100 Subject: [PATCH 2/3] Revert "Pin docutils to 0.21 (#9344)" This reverts commit 6df6cd448069ac09bafc360b6f7a470773c74707. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f22620805..f4514925d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,6 @@ dynamic = [ "version", ] optional-dependencies.docs = [ - "docutils==0.21", # Pending https://github.com/pradyunsg/sphinx-inline-tabs/pull/51 "furo", "olefile", "sphinx>=8.2", From ca21683316a96b348197a6f5ca97ea9c6c142bb0 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Mon, 22 Dec 2025 18:12:10 +1100 Subject: [PATCH 3/3] Cast to UINT32 before shifting bits (#9347) --- src/libImaging/BcnDecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libImaging/BcnDecode.c b/src/libImaging/BcnDecode.c index ac81ed6df..d99b0e28e 100644 --- a/src/libImaging/BcnDecode.c +++ b/src/libImaging/BcnDecode.c @@ -663,7 +663,7 @@ half_to_float(UINT16 h) { if (o.f >= m.f) { o.u |= 255 << 23; } - o.u |= (h & 0x8000) << 16; + o.u |= (UINT32)(h & 0x8000) << 16; return o.f; }