[cli] Switch to for version detection

Author: Breakthrough

scenedetect/platform.py

@@ -15,7 +15,7 @@
 functions to handle logging and invoking external commands.
 """
 
-import importlib
+import importlib.metadata
 import logging
 import os
 import os.path
@@ -325,29 +325,34 @@ def get_system_version_info() -> str:
         )
     ]
 
-    # Third-Party Packages
+    # Third-Party Packages: queried via PyPI distribution names. `cv2` is exposed by either
+    # `opencv-python` or `opencv-python-headless` - both are listed so whichever is installed
+    # gets reported. `scenedetect` is read from the package attribute since it must report a
+    # version even when run uninstalled (e.g. from a source checkout). The import is deferred
+    # to avoid a circular import at module load time.
+    from scenedetect import __version__ as scenedetect_version
+
     out_lines += ["", "Packages", line_separator]
-    third_party_packages = (
+    out_lines.append(output_template.format("scenedetect", scenedetect_version))
+    third_party_distributions = (
         "av",
         "click",
-        "cv2",
+        "opencv-python",
+        "opencv-python-headless",
         "imageio",
-        "imageio_ffmpeg",
+        "imageio-ffmpeg",
         "moviepy",
         "numpy",
         "platformdirs",
-        "scenedetect",
         "tqdm",
     )
-    for module_name in third_party_packages:
+    for dist_name in third_party_distributions:
         try:
-            module = importlib.import_module(module_name)
-            if hasattr(module, "__version__"):
-                out_lines.append(output_template.format(module_name, module.__version__))
-            else:
-                out_lines.append(output_template.format(module_name, not_found_str))
-        except ModuleNotFoundError:
-            out_lines.append(output_template.format(module_name, not_found_str))
+            out_lines.append(
+                output_template.format(dist_name, importlib.metadata.version(dist_name))
+            )
+        except importlib.metadata.PackageNotFoundError:
+            out_lines.append(output_template.format(dist_name, not_found_str))
 
     # External Tools
     out_lines += ["", "Tools", line_separator]

scripts/generate_assets.py

@@ -200,7 +200,7 @@ def _render_slate(inkscape: str, work_dir: Path, side: int, *, inverted: bool) -
     With inverted=False, the slate renders with its native FG body / BG stripes
     (right for placing on the white banner). With inverted=True, the SVG color
     codes are swapped before rendering so the body becomes BG and the stripes
-    FG — needed for the dialog's dark FG strip, where a non-inverted slate
+    FG - needed for the dialog's dark FG strip, where a non-inverted slate
     would blend into the background.
     """
     if inverted:
@@ -256,18 +256,18 @@ def render_installer_jpegs(inkscape: str, work_dir: Path) -> None:
     """Render the per-scale baseline JPEGs that ship inside the MSI.
 
     Outputs `Generated Images/installer_{banner,logo}{,.scale-125,.scale-150,.scale-200}.jpg`
-    from the master SVG. These are gitignored — pre_release.py --release rebuilds
+    from the master SVG. These are gitignored - pre_release.py --release rebuilds
     them before each MSI build, so they always match the current logo without
     being re-committed every time.
     """
     GENERATED_IMAGES_DIR.mkdir(parents=True, exist_ok=True)
-    # Render the slate at the exact target size each iteration — sharper than
+    # Render the slate at the exact target size each iteration - sharper than
     # rendering once big and downsampling, and avoids Pillow's resize stub mismatch.
     for scale, suffix in SCALES:
         bw, bh = round(BANNER_BASE[0] * scale), round(BANNER_BASE[1] * scale)
         dw, dh = round(DIALOG_BASE[0] * scale), round(DIALOG_BASE[1] * scale)
 
-        # Banner icon sized off height (the limiting dim — banner is wide & short).
+        # Banner icon sized off height (the limiting dim - banner is wide & short).
         # Strip is wider than the icon, so the icon centers within it.
         banner_icon_side = round(bh * BANNER_ICON_FRAC)
         slate_fg = _render_slate(inkscape, work_dir, banner_icon_side, inverted=False)
@@ -285,7 +285,7 @@ def render_installer_jpegs(inkscape: str, work_dir: Path) -> None:
 
 
 def render_installer_static(inkscape: str, work_dir: Path) -> None:
-    """Render the stable, committed installer assets — only re-run when the logo changes.
+    """Render the stable, committed installer assets - only re-run when the logo changes.
 
     Outputs:
       - psd_square_small.ico (copy of pyscenedetect.ico)

tests/test_video_stream.py

@@ -42,9 +42,9 @@
 
 
 def get_moviepy_major_version() -> int:
-    import moviepy
+    import importlib.metadata
 
-    return int(moviepy.__version__.split(".")[0])
+    return int(importlib.metadata.version("moviepy").split(".")[0])
 
 
 def calculate_frame_delta(frame_a, frame_b, roi=None) -> float: