Fix conflicts

Author: agriyakhetarpal

make_wheels.py

@@ -91,6 +91,17 @@ def write_wheel(out_dir, *, name, version, tag, metadata, description, contents)
     for header, value in metadata:
         filtered_metadata.append((header, value))
 
+    # The WHEEL file must contain the compatibility tags in their expanded form.
+    # see https://packaging.python.org/en/latest/specifications/binary-distribution-format/#file-contents
+    # see https://packaging.python.org/en/latest/specifications/platform-compatibility-tags/#compressed-tag-sets
+    pytag, abitag, platformtag = tag.split("-")
+    expanded_tags = [
+        "-".join((x, y, z))
+        for z in platformtag.split(".")
+        for y in abitag.split(".")
+        for x in pytag.split(".")
+    ]
+
     return write_wheel_file(os.path.join(out_dir, wheel_name), {
         **contents,
         f'{dist_info}/entry_points.txt': make_message([],
@@ -106,7 +117,7 @@ def write_wheel(out_dir, *, name, version, tag, metadata, description, contents)
             ('Wheel-Version', '1.0'),
             ('Generator', 'ziglang make_wheels.py'),
             ('Root-Is-Purelib', 'false'),
-            ('Tag', tag),
+            ('Tag', expanded_tags),
         ]),
     })
 
@@ -178,7 +189,8 @@ def write_ziglang_wheel(out_dir, *, version, platform, archive):
         'lib/libcxx/LICENSE.TXT',
         'lib/libcxxabi/LICENSE.TXT',
         'lib/libunwind/LICENSE.TXT',
-	'lib/libc/freebsd/COPYRIGHT',
+	    'lib/libc/freebsd/COPYRIGHT',
+        'lib/libc/wasi/fts/musl-fts/COPYING',
     ]
     excluded_license_paths = [
         # not a license text; contains macros that generate license strings
@@ -275,8 +287,7 @@ def dummy(): """Dummy function for an entrypoint. Zig is executed as a side effe
             ('Classifier', 'Topic :: Software Development :: Compilers'),
             ('Classifier', 'Topic :: Software Development :: Code Generators'),
             ('Classifier', 'Topic :: Software Development :: Build Tools'),
-            ('Classifier', 'Programming Language :: Other'),
-            ('Classifier', 'Programming Language :: Other Scripting Engines'),
+            ('Classifier', 'Programming Language :: Zig'),
             ('Project-URL', 'Homepage, https://ziglang.org'),
             ('Project-URL', 'Source Code, https://github.com/ziglang/zig-pypi'),
             ('Project-URL', 'Bug Tracker, https://github.com/ziglang/zig-pypi/issues'),
@@ -342,7 +353,7 @@ def get_argparser():
     supported_platforms = ', '.join(sorted(ZIG_PYTHON_PLATFORMS.keys()))
     description = (f"Repackage official Zig downloads as Python wheels.\n\n"
                    f"Supported platforms: {supported_platforms}")
-    
+
     parser = argparse.ArgumentParser(prog=__file__, description=description,
                                    formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('--version', default='latest',