Prevent appending "universal" for unknown arch

Co-authored-by: Matthieu Darbois <[email protected]>

Author: lawrence-danna-apple

packaging/tags.py

@@ -410,7 +410,7 @@ def _mac_binary_formats(version, cpu_arch):
     elif cpu_arch == "arm64":
         formats.append("universal2")
 
-    if cpu_arch != "arm64":
+    if cpu_arch in {"x86_64", "i386", "ppc64", "ppc"}:
         formats.append("universal")
 
     return formats

tests/test_tags.py

@@ -247,7 +247,9 @@ def test_architectures(self, arch, is_32bit, expected):
             ((10, 7), "ppc", []),
             ((10, 6), "ppc", ["ppc", "fat32", "fat", "universal"]),
             ((10, 0), "ppc", ["ppc", "fat32", "fat", "universal"]),
-            ((11, 0), "riscv", ["riscv", "universal"]),
+            ((11, 0), "riscv", ["riscv"]),
+            ((11, 0), "x86_64", ["x86_64", "intel", "fat64", "fat32", "universal2", "universal"]),
+            ((11, 0), "arm64", ["arm64", "universal2"]),
         ],
     )
     def test_binary_formats(self, version, arch, expected):