Post-#99 updates (#102)

* Fix .dist-info checks in unmake-variant

* Harmonize .dist-info file checks across commands

* Use modern entry point API in commands

Author: mgorny

variantlib/commands/analyze_wheel.py

@@ -69,7 +69,12 @@ def analyze_wheel(args: list[str]) -> None:
 
     with zipfile.ZipFile(input_file, "r") as zip_file:
         for name in zip_file.namelist():
-            if name.endswith(f".dist-info/{VARIANT_DIST_INFO_FILENAME}"):
+            components = name.split("/", 2)
+            if (
+                len(components) == 2
+                and components[0].endswith(".dist-info")
+                and components[1] == VARIANT_DIST_INFO_FILENAME
+            ):
                 variant_dist_info = VariantDistInfo(zip_file.read(name), variant_hash)
                 break
         else:

variantlib/commands/generate_index_json.py

@@ -67,7 +67,12 @@ def generate_index_json(args: list[str]) -> None:
             with zipfile.ZipFile(wheel, "r") as zip_file:
                 # Find the variant dist-info file
                 for name in zip_file.namelist():
-                    if name.endswith(f".dist-info/{VARIANT_DIST_INFO_FILENAME}"):
+                    components = name.split("/", 2)
+                    if (
+                        len(components) == 2
+                        and components[0].endswith(".dist-info")
+                        and components[1] == VARIANT_DIST_INFO_FILENAME
+                    ):
                         variant_dist_info = VariantDistInfo(zip_file.read(name), vhash)
                         break
                 else:

variantlib/commands/make_variant.py

@@ -163,24 +163,15 @@ def _make_variant(
     ):
         for file_info in input_zip.infolist():
             components = file_info.filename.split("/", 2)
-            with (
-                input_zip.open(file_info, "r") as input_file,
-            ):
-                if (
-                    len(components) != 2
-                    or not components[0].endswith(".dist-info")
-                    or components[1] not in ("RECORD", VARIANT_DIST_INFO_FILENAME)
-                ):
-                    with output_zip.open(file_info, "w") as output_file:
-                        shutil.copyfileobj(input_file, output_file)
+            is_dist_info = len(components) == 2 and components[0].endswith(".dist-info")
 
-                elif components[1] == VARIANT_DIST_INFO_FILENAME:
-                    # If a wheel dist-info file exists already, discard the existing
-                    # copy.
-                    continue
+            if is_dist_info and components[1] == VARIANT_DIST_INFO_FILENAME:
+                # If a wheel dist-info file exists already, discard the existing
+                # copy.
+                continue
 
-                else:  # RECORD
-                    assert components[1] == "RECORD"
+            with input_zip.open(file_info, "r") as input_file:
+                if is_dist_info and components[1] == "RECORD":
                     # First, add new dist-info file prior to RECORD (not strictly
                     # required, but a nice convention).
                     dist_info_path = f"{components[0]}/{VARIANT_DIST_INFO_FILENAME}"
@@ -208,5 +199,8 @@ def _make_variant(
                                 f"{len(dist_info_data)}\n"
                             ).encode()
                         )
+                else:
+                    with output_zip.open(file_info, "w") as output_file:
+                        shutil.copyfileobj(input_file, output_file)
 
     logger.info("Variant Wheel Created: `%s`", output_filepath.resolve())

variantlib/commands/unmake_variant.py

@@ -94,33 +94,26 @@ def _unmake_variant(
     ):
         for file_info in input_zip.infolist():
             components = file_info.filename.split("/", 2)
+            is_dist_info = len(components) == 2 and components[0].endswith(".dist-info")
 
-            if (
-                ".dist-info/" in file_info.filename
-                and components[1] == VARIANT_DIST_INFO_FILENAME
-            ):
+            if is_dist_info and components[1] == VARIANT_DIST_INFO_FILENAME:
                 # This is the variant.json file, we skip it.
                 continue
 
-            with input_zip.open(file_info, "r") as input_file:
-                if (
-                    len(components) != 2
-                    or not components[0].endswith(".dist-info")
-                    or components[1] not in ("RECORD", VARIANT_DIST_INFO_FILENAME)
-                ):
-                    with output_zip.open(file_info, "w") as output_file:
-                        shutil.copyfileobj(input_file, output_file)
-
-                else:
-                    assert components[1] == "RECORD"
+            with (
+                input_zip.open(file_info, "r") as input_file,
+                output_zip.open(file_info, "w") as output_file,
+            ):
+                if is_dist_info and components[1] == "RECORD":
                     # Update RECORD to remove the checksum.
-                    with output_zip.open(file_info, "w") as output_file:
-                        variant_dist_info_path = (
-                            f"{components[0]}/{VARIANT_DIST_INFO_FILENAME}"
-                        ).encode()
-                        for line in input_file:
-                            rec_filename, sha256, size = line.split(b",")
-                            if rec_filename != variant_dist_info_path:
-                                output_file.write(line)
+                    variant_dist_info_path = (
+                        f"{components[0]}/{VARIANT_DIST_INFO_FILENAME}"
+                    ).encode()
+                    for line in input_file:
+                        rec_filename, sha256, size = line.split(b",")
+                        if rec_filename != variant_dist_info_path:
+                            output_file.write(line)
+                else:
+                    shutil.copyfileobj(input_file, output_file)
 
     logger.info("Variant Wheel Created: `%s`", output_filepath.resolve())

variantlib/commands/utils.py

@@ -6,17 +6,15 @@
 
 if sys.version_info >= (3, 10):
     from importlib.metadata import EntryPoint
-    from importlib.metadata import distributions
+    from importlib.metadata import entry_points
 else:
     from importlib_metadata import EntryPoint
-    from importlib_metadata import distributions
+    from importlib_metadata import entry_points
 
 
 def get_registered_commands(group: str) -> dict[str, EntryPoint]:
     """Collect entry points for the given group, preserving original names."""
     commands = {}
-    for dist in distributions():
-        for ep in dist.entry_points:
-            if ep.group == group:
-                commands[ep.name] = ep
+    for ep in entry_points().select(group=group):
+        commands[ep.name] = ep
     return commands