feat: add support for manylinux_2_28 i686 image (#2480)

Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>

unit_test/main_tests/main_options_test.py

@@ -111,8 +111,9 @@ def test_empty_selector(monkeypatch):
         ("x86_64", "manylinux_2_28", "quay.io/pypa/manylinux_2_28_x86_64:*"),
         ("x86_64", "manylinux_2_34", "quay.io/pypa/manylinux_2_34_x86_64:*"),
         ("x86_64", "custom_image", "custom_image"),
-        ("i686", None, "quay.io/pypa/manylinux2014_i686:*"),
+        ("i686", None, "quay.io/pypa/manylinux_2_28_i686:*"),
         ("i686", "manylinux2014", "quay.io/pypa/manylinux2014_i686:*"),
+        ("i686", "manylinux_2_28", "quay.io/pypa/manylinux_2_28_i686:*"),
         ("i686", "custom_image", "custom_image"),
         ("pypy_x86_64", None, "quay.io/pypa/manylinux_2_28_x86_64:*"),
         ("pypy_x86_64", "manylinux2014", "quay.io/pypa/manylinux2014_x86_64:*"),

unit_test/option_prepare_test.py

@@ -70,7 +70,7 @@ def test_build_default_launches(monkeypatch):
     assert identifiers == {f"{x}-manylinux_x86_64" for x in DEFAULT_IDS}
 
     kwargs = build_in_container.call_args_list[1][1]
-    assert "quay.io/pypa/manylinux2014_i686" in kwargs["container"]["image"]
+    assert "quay.io/pypa/manylinux_2_28_i686" in kwargs["container"]["image"]
     assert kwargs["container"]["cwd"] == PurePosixPath("/project")
     assert kwargs["container"]["oci_platform"] == OCIPlatform.i386
 
@@ -128,7 +128,7 @@ before-all = "true"
 
     build_in_container = typing.cast(mock.Mock, platforms.linux.build_in_container)
 
-    assert build_in_container.call_count == 6
+    assert build_in_container.call_count == 7
 
     kwargs = build_in_container.call_args_list[0][1]
     assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["container"]["image"]
@@ -189,11 +189,19 @@ before-all = "true"
     assert "quay.io/pypa/manylinux2014_i686" in kwargs["container"]["image"]
     assert kwargs["container"]["cwd"] == PurePosixPath("/project")
     assert kwargs["container"]["oci_platform"] == OCIPlatform.i386
-
     identifiers = {x.identifier for x in kwargs["platform_configs"]}
-    assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS if "gp" not in x}
+    assert identifiers == {"cp38-manylinux_i686", "cp39-manylinux_i686"}
 
     kwargs = build_in_container.call_args_list[4][1]
+    assert "quay.io/pypa/manylinux_2_28_i686" in kwargs["container"]["image"]
+    assert kwargs["container"]["cwd"] == PurePosixPath("/project")
+    assert kwargs["container"]["oci_platform"] == OCIPlatform.i386
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {
+        f"{x}-manylinux_i686" for x in ALL_IDS - {"cp38", "cp39"} if "gp" not in x
+    }
+
+    kwargs = build_in_container.call_args_list[5][1]
     assert "quay.io/pypa/musllinux_1_2_x86_64" in kwargs["container"]["image"]
     assert kwargs["container"]["cwd"] == PurePosixPath("/project")
     assert kwargs["container"]["oci_platform"] == OCIPlatform.AMD64
@@ -202,7 +210,7 @@ before-all = "true"
         f"{x}-musllinux_x86_64" for x in ALL_IDS if "pp" not in x and "gp" not in x
     }
 
-    kwargs = build_in_container.call_args_list[5][1]
+    kwargs = build_in_container.call_args_list[6][1]
     assert "quay.io/pypa/musllinux_1_2_i686" in kwargs["container"]["image"]
     assert kwargs["container"]["cwd"] == PurePosixPath("/project")
     assert kwargs["container"]["oci_platform"] == OCIPlatform.i386

unit_test/options_toml_test.py

@@ -69,7 +69,7 @@ def test_simple_settings(tmp_path, platform, fname):
     assert options_reader.get("test-groups", option_format=ListFormat(" ")) == "three four"
 
     assert options_reader.get("manylinux-x86_64-image") == "manylinux_2_28"
-    assert options_reader.get("manylinux-i686-image") == "manylinux2014"
+    assert options_reader.get("manylinux-i686-image") == "manylinux_2_28"
 
     with pytest.raises(OptionsReaderError):
         # fails because the option is a table and the option_format only works with lists
@@ -104,7 +104,7 @@ def test_envvar_override(tmp_path, platform):
 
     assert options_reader.get("build") == "cp38*"
     assert options_reader.get("manylinux-x86_64-image") == "manylinux_2_24"
-    assert options_reader.get("manylinux-i686-image") == "manylinux2014"
+    assert options_reader.get("manylinux-i686-image") == "manylinux_2_28"
 
     assert (
         options_reader.get("xbuild-tools", option_format=ListFormat(" ", quote=shlex.quote))