Merge branch 'main' into docs-tags-abi3t-versionchanged-26-1

Author: brettcannon

src/packaging/tags.py

@@ -545,12 +545,12 @@ def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
     if cpu_arch == "x86_64":
         if version < (10, 4):
             return []
-        formats.extend(["intel", "fat64", "fat32"])
+        formats.extend(["intel", "fat64", "fat3"])
 
     elif cpu_arch == "i386":
         if version < (10, 4):
             return []
-        formats.extend(["intel", "fat32", "fat"])
+        formats.extend(["intel", "fat3", "fat"])
 
     elif cpu_arch == "ppc64":
         # TODO: Need to care about 32-bit PPC for ppc64 through 10.2?
@@ -561,7 +561,7 @@ def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
     elif cpu_arch == "ppc":
         if version > (10, 6):
             return []
-        formats.extend(["fat32", "fat"])
+        formats.extend(["fat3", "fat"])
 
     if cpu_arch in {"arm64", "x86_64"}:
         formats.append("universal2")

tests/test_tags.py

@@ -276,16 +276,16 @@ def test_architectures(self, arch: str, is_32bit: bool, expected: str) -> None:
             (
                 (10, 15),
                 "x86_64",
-                ["x86_64", "intel", "fat64", "fat32", "universal2", "universal"],
+                ["x86_64", "intel", "fat64", "fat3", "universal2", "universal"],
             ),
             (
                 (10, 4),
                 "x86_64",
-                ["x86_64", "intel", "fat64", "fat32", "universal2", "universal"],
+                ["x86_64", "intel", "fat64", "fat3", "universal2", "universal"],
             ),
             ((10, 3), "x86_64", []),
-            ((10, 15), "i386", ["i386", "intel", "fat32", "fat", "universal"]),
-            ((10, 4), "i386", ["i386", "intel", "fat32", "fat", "universal"]),
+            ((10, 15), "i386", ["i386", "intel", "fat3", "fat", "universal"]),
+            ((10, 4), "i386", ["i386", "intel", "fat3", "fat", "universal"]),
             ((10, 3), "intel", ["intel", "universal"]),
             ((10, 5), "intel", ["intel", "universal"]),
             ((10, 15), "intel", ["intel", "universal"]),
@@ -296,13 +296,13 @@ def test_architectures(self, arch: str, is_32bit: bool, expected: str) -> None:
             ((10, 3), "ppc64", []),
             ((10, 15), "ppc", []),
             ((10, 7), "ppc", []),
-            ((10, 6), "ppc", ["ppc", "fat32", "fat", "universal"]),
-            ((10, 0), "ppc", ["ppc", "fat32", "fat", "universal"]),
+            ((10, 6), "ppc", ["ppc", "fat3", "fat", "universal"]),
+            ((10, 0), "ppc", ["ppc", "fat3", "fat", "universal"]),
             ((11, 0), "riscv", ["riscv"]),
             (
                 (11, 0),
                 "x86_64",
-                ["x86_64", "intel", "fat64", "fat32", "universal2", "universal"],
+                ["x86_64", "intel", "fat64", "fat3", "universal2", "universal"],
             ),
             ((11, 0), "arm64", ["arm64", "universal2"]),
             ((11, 1), "arm64", ["arm64", "universal2"]),
@@ -377,13 +377,13 @@ def test_mac_platforms(self) -> None:
             "macosx_10_5_x86_64",
             "macosx_10_5_intel",
             "macosx_10_5_fat64",
-            "macosx_10_5_fat32",
+            "macosx_10_5_fat3",
             "macosx_10_5_universal2",
             "macosx_10_5_universal",
             "macosx_10_4_x86_64",
             "macosx_10_4_intel",
             "macosx_10_4_fat64",
-            "macosx_10_4_fat32",
+            "macosx_10_4_fat3",
             "macosx_10_4_universal2",
             "macosx_10_4_universal",
         ]