Sort compressed tag sets when rewriting wheel filename (#584)

* Always sort platform tags

* Update tests

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Matthieu Darbois <[email protected]>

Author: 3 people

src/auditwheel/wheeltools.py

@@ -242,7 +242,7 @@ def add_platforms(
 
     fparts = {
         "prefix": wheel_fname.rsplit("-", maxsplit=1)[0],
-        "plat": ".".join(fname_tags),
+        "plat": ".".join(sorted(fname_tags)),
         "ext": splitext(wheel_fname)[1],
     }
     out_wheel_fname = "{prefix}-{plat}{ext}".format(**fparts)

tests/integration/test_manylinux.py

@@ -461,7 +461,12 @@ def anylinux(
 
         with docker_container_ctx(manylinux_img, io_folder, env) as container:
             platform_tag = ".".join(
-                [f"{p}_{PLATFORM}" for p in [policy, *POLICY_ALIASES.get(policy, [])]]
+                sorted(
+                    [
+                        f"{p}_{PLATFORM}"
+                        for p in [policy, *POLICY_ALIASES.get(policy, [])]
+                    ]
+                )
             )
             yield AnyLinuxContainer(
                 f"{policy}_{PLATFORM}", platform_tag, container, io_folder
@@ -813,9 +818,9 @@ def test_cross_repair(
         else:
             assert libc == Libc.GLIBC
             source = "glibc"
-            platform_tag = f"manylinux_2_17_{arch.value}.manylinux2014_{arch.value}"
+            platform_tag = f"manylinux2014_{arch.value}.manylinux_2_17_{arch.value}"
             if arch in {Architecture.x86_64, Architecture.i686}:
-                platform_tag = f"manylinux_2_5_{arch.value}.manylinux1_{arch.value}"
+                platform_tag = f"manylinux1_{arch.value}.manylinux_2_5_{arch.value}"
             elif arch == Architecture.riscv64:
                 platform_tag = f"manylinux_2_31_{arch.value}"
             python_abi = "cp313-cp313"
@@ -939,24 +944,26 @@ def test_compat(
 
         if PLATFORM in {"x86_64", "i686"}:
             expect = f"manylinux_2_5_{PLATFORM}"
-            expect_tag = f"manylinux_2_5_{PLATFORM}.manylinux1_{PLATFORM}"
+            expect_tag = f"manylinux1_{PLATFORM}.manylinux_2_5_{PLATFORM}"
         else:
             expect = f"manylinux_2_17_{PLATFORM}"
-            expect_tag = f"manylinux_2_17_{PLATFORM}.manylinux2014_{PLATFORM}"
+            expect_tag = f"manylinux2014_{PLATFORM}.manylinux_2_17_{PLATFORM}"
 
         target_tag = target_policy
         for pep600_policy, aliases in POLICY_ALIASES.items():
             policy_ = f"{pep600_policy}_{PLATFORM}"
             aliases_ = [f"{p}_{PLATFORM}" for p in aliases]
             if target_policy == policy_ or target_policy in aliases_:
-                target_tag = f"{policy_}.{'.'.join(aliases_)}"
+                target_tag = ".".join(sorted([policy_, *aliases_]))
 
         # we shall ba able to repair the wheel for all targets
         anylinux.repair(orig_wheel, plat=target_policy, only_plat=only_plat)
         if only_plat or target_tag == expect_tag:
             repaired_tag = target_tag
         else:
-            repaired_tag = f"{expect_tag}.{target_tag}"
+            repaired_tag = ".".join(
+                sorted(expect_tag.split(".") + target_tag.split("."))
+            )
         repaired_wheel = anylinux.check_wheel("testsimple", platform_tag=repaired_tag)
 
         assert_show_output(anylinux, repaired_wheel, expect, True)