Merge branch '2.x'

# Conflicts: # cibuildwheel/__init__.py # cibuildwheel/options.py # cibuildwheel/resources/pinned_docker_images.cfg # cibuildwheel/resources/virtualenv.toml # docs/setup.md # examples/github-deploy.yml # unit_test/options_test.py
2025-03-21 10:41:39 +00:00
parent 1826f70682 42728e866b
commit 54a0cd0b22
19 changed files with 41 additions and 36 deletions
@@ -561,4 +561,4 @@ def test_deprecated_image(image: str, deprecated: bool, capsys: pytest.CaptureFi
        assert f"Deprecated image {image!r}" in captured.err
        assert f"{resolved_image!r}" in captured.err
    else:
-        assert captured.err == ""
+        assert "Deprecated image" not in captured.err