Restore runs-on: windows-latest (#5835)

* Revert "s/windows-2022/windows-latest/ in .github/workflows/{ci,pip}.yml (#5826)"

This reverts commit 852a4b5010.

* Add module-level skip for Windows build >= 26100 in test_iostream.py

* Changes suggested by at-henryiii
This commit is contained in:
Ralf W. Grosse-Kunstleve
2025-09-12 21:52:44 -07:00
committed by GitHub
parent 937552f0ad
commit d4d555d9e0
3 changed files with 23 additions and 12 deletions

View File

@@ -119,7 +119,7 @@ jobs:
- runs-on: macos-latest
python-version: 'graalpy-24.2'
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.9'
cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON
- runs-on: windows-2022
@@ -138,19 +138,19 @@ jobs:
- runs-on: windows-2022
python-version: '3.13'
cmake-args: -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.13t'
cmake-args: -DCMAKE_CXX_STANDARD=17
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.14'
cmake-args: -DCMAKE_CXX_STANDARD=20
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.14t'
cmake-args: -DCMAKE_CXX_STANDARD=23
- runs-on: windows-2022
- runs-on: windows-latest
python-version: 'pypy-3.10'
cmake-args: -DCMAKE_CXX_STANDARD=17
- runs-on: windows-2022
- runs-on: windows-latest
python-version: 'pypy3.11'
cmake-args: -DCMAKE_CXX_STANDARD=20
# The setup-python action currently doesn't have graalpy for windows
@@ -174,7 +174,7 @@ jobs:
python-version: '3.9'
- runs-on: macos-latest
python-version: '3.12'
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.11'
name: "🐍 ${{ matrix.python-version }} • ${{ matrix.runs-on }} • x64 inplace C++14"
@@ -1010,8 +1010,8 @@ jobs:
mingw:
if: github.event.pull_request.draft == false
name: "🐍 3 • windows-2022 • ${{ matrix.sys }}"
runs-on: windows-2022
name: "🐍 3 • windows-latest • ${{ matrix.sys }}"
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
@@ -1121,7 +1121,7 @@ jobs:
strategy:
matrix:
os: [windows-2022]
os: [windows-latest]
python: ['3.10']
runs-on: "${{ matrix.os }}"

View File

@@ -19,8 +19,8 @@ jobs:
# This builds the sdists and wheels and makes sure the files are exactly as
# expected.
test-packaging:
name: 🐍 3.8 • 📦 tests • windows-2022
runs-on: windows-2022
name: 🐍 3.8 • 📦 tests • windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v5

View File

@@ -6,8 +6,19 @@ from io import StringIO
import pytest
import env
from pybind11_tests import iostream as m
if env.WIN:
wv_build = sys.getwindowsversion().build
skip_if_ge = 26100
if wv_build >= skip_if_ge:
pytest.skip(
f"Windows build {wv_build} >= {skip_if_ge}:"
" Skipping iostream capture (redirection regression needs investigation)",
allow_module_level=True,
)
def test_captured(capsys):
msg = "I've been redirected to Python, I hope!"