Merge remote-tracking branch 'origin/main' into fmtpass-alt

unit_test/build_selector_test.py

@@ -53,6 +53,9 @@ def test_skip():
 
     assert not build_selector("pp36-manylinux_x86_64")
     assert build_selector("pp37-manylinux_x86_64")
+    assert build_selector("pp38-manylinux_x86_64")
+    assert build_selector("pp37-manylinux_i686")
+    assert build_selector("pp38-manylinux_i686")
     assert build_selector("cp36-manylinux_x86_64")
     assert build_selector("cp37-manylinux_x86_64")
     assert not build_selector("cp36-manylinux_i686")

unit_test/option_prepare_test.py

@@ -11,7 +11,7 @@ import pytest
 from cibuildwheel import linux, util
 from cibuildwheel.__main__ import main
 
-ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37"}
+ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37", "pp38"}
 
 
 @pytest.fixture
@@ -132,7 +132,9 @@ before-all = "true"
     assert not kwargs["docker"]["simulate_32_bit"]
 
     identifiers = {x.identifier for x in kwargs["platform_configs"]}
-    assert identifiers == {f"{x}-manylinux_x86_64" for x in ALL_IDS - {"cp36", "cp310", "pp37"}}
+    assert identifiers == {
+        f"{x}-manylinux_x86_64" for x in ALL_IDS - {"cp36", "cp310", "pp37", "pp38"}
+    }
     assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == ""
 
     kwargs = build_on_docker.call_args_list[2][1]
@@ -140,7 +142,11 @@ before-all = "true"
     assert kwargs["docker"]["cwd"] == Path("/project")
     assert not kwargs["docker"]["simulate_32_bit"]
     identifiers = {x.identifier for x in kwargs["platform_configs"]}
-    assert identifiers == {"cp310-manylinux_x86_64", "pp37-manylinux_x86_64"}
+    assert identifiers == {
+        "cp310-manylinux_x86_64",
+        "pp37-manylinux_x86_64",
+        "pp38-manylinux_x86_64",
+    }
 
     kwargs = build_on_docker.call_args_list[3][1]
     assert "quay.io/pypa/manylinux2010_i686" in kwargs["docker"]["docker_image"]

unit_test/utils.py

@@ -7,7 +7,7 @@ def get_default_command_line_arguments() -> CommandLineArguments:
     defaults.platform = "auto"
     defaults.allow_empty = False
     defaults.archs = None
-    defaults.config_file = None
+    defaults.config_file = ""
     defaults.output_dir = None
     defaults.package_dir = "."
     defaults.prerelease_pythons = False