[dist] Omit trailing suffixes on artifacts to match existing convention

Author: Breakthrough

scripts/_release_common.py

@@ -23,14 +23,26 @@
 
 
 def msi_version(raw: str) -> str:
-    # Mirror scripts/update_installer.py - artifact filenames use the
-    # normalized X.Y.Z form, not the raw Python __version__.
+    # AdvancedInstaller's MSI ProductVersion field requires numeric X.Y.Z[.B];
+    # strip Python-style suffixes ("0.7-dev0" -> "0.7") and pad to three parts.
+    # Use this ONLY for the /SetVersion value passed to AdvancedInstaller, not
+    # for artifact filenames - those should use display_version() to match the
+    # Python package version (e.g. PyPI "0.7", not "0.7.0").
     parts = [re.split(r"[^\d]", p, maxsplit=1)[0] for p in raw.split(".")]
     while len(parts) < 3:
         parts.append("0")
     return ".".join(parts[:4])
 
 
+def display_version(raw: str) -> str:
+    # Filename-facing version: matches scenedetect.__version__ component count,
+    # with Python-style suffixes stripped ("0.7-dev0" -> "0.7", "0.7" -> "0.7",
+    # "0.7.1" -> "0.7.1"). Use for .msi/.zip/manifest filenames so artifacts
+    # line up with the PyPI package and git tag.
+    parts = [re.split(r"[^\d]", p, maxsplit=1)[0] for p in raw.split(".")]
+    return ".".join(p for p in parts[:4] if p)
+
+
 def find_7zip() -> Path:
     for candidate in (
         Path(r"C:\Program Files\7-Zip\7z.exe"),

scripts/finalize_windows_dist.py

@@ -44,16 +44,16 @@
 
 import validate_release  # noqa: E402
 from _release_common import (  # noqa: E402
+    display_version,
     find_7zip,
     hash_zip_contents,
-    msi_version,
     sha256_file,
     verify_authenticode,
 )
 
 import scenedetect  # noqa: E402
 
-VERSION = msi_version(scenedetect.__version__)
+VERSION = display_version(scenedetect.__version__)
 
 
 def extract_signed_bundle(signed_zip: Path, dest: Path) -> tuple[Path, Path]:

scripts/stage_windows_dist.py

@@ -33,7 +33,6 @@
 # into a combined "prepare_windows_dist.py".
 
 import argparse
-import re
 import shutil
 import subprocess
 import sys
@@ -46,6 +45,9 @@
 
 REPO_DIR = Path(__file__).resolve().parent.parent
 sys.path.insert(0, str(REPO_DIR))
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+
+from _release_common import display_version, find_7zip  # noqa: E402
 
 import scenedetect  # noqa: E402
 
@@ -56,23 +58,6 @@
 THIRDPARTY_LICENSES = REPO_DIR / "scenedetect" / "_thirdparty"
 
 
-def msi_version(raw: str) -> str:
-    parts = [re.split(r"[^\d]", p, maxsplit=1)[0] for p in raw.split(".")]
-    while len(parts) < 3:
-        parts.append("0")
-    return ".".join(parts[:4])
-
-
-def find_7zip() -> Path:
-    for candidate in (
-        Path(r"C:\Program Files\7-Zip\7z.exe"),
-        Path(r"C:\Program Files (x86)\7-Zip\7z.exe"),
-    ):
-        if candidate.exists():
-            return candidate
-    sys.exit("7-Zip not found. Install from https://www.7-zip.org/.")
-
-
 def _rel(p: Path) -> str:
     # Display paths relative to the repo when possible, else fall back to the
     # absolute path (e.g. --ffmpeg-dir pointing outside the repo on CI).
@@ -190,7 +175,7 @@ def main() -> None:
     copy_file(PACKAGING_WIN / "README.txt", DIST_TREE / "README.txt")
     stage_thirdparty_licenses()
     build_docs()
-    make_portable_zip(msi_version(scenedetect.__version__))
+    make_portable_zip(display_version(scenedetect.__version__))
 
 
 if __name__ == "__main__":

scripts/update_installer.py

@@ -21,32 +21,22 @@
 
 import argparse
 import os
-import re
 import subprocess
 import sys
 from pathlib import Path
 
 REPO_DIR = Path(__file__).resolve().parent.parent
 sys.path.insert(0, str(REPO_DIR))
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+
+from _release_common import display_version, msi_version  # noqa: E402
 
 import scenedetect  # noqa: E402
 
 INSTALLER_AIP = REPO_DIR / "packaging" / "windows" / "installer" / "PySceneDetect.aip"
 DIST_TREE = REPO_DIR / "dist" / "scenedetect"
 
 
-def msi_version(raw: str) -> str:
-    # AdvancedInstaller's ProductVersion only accepts numeric X[.Y[.Z[.B]]].
-    # Strip Python-style suffixes ("0.7-dev0" -> "0.7"; "1.0.0-rc1" -> "1.0.0")
-    # and pad to three components so the resulting MSI filename is consistent.
-    parts = [re.split(r"[^\d]", p, maxsplit=1)[0] for p in raw.split(".")]
-    if not all(p.isdigit() for p in parts if p):
-        sys.exit(f"Cannot derive numeric MSI version from {raw!r}")
-    while len(parts) < 3:
-        parts.append("0")
-    return ".".join(parts[:4])
-
-
 def find_advinst() -> Path:
     if env := os.environ.get("ADVINST"):
         path = Path(env)
@@ -122,24 +112,28 @@ def main() -> None:
         print(f"Re-syncing APPDIR in {INSTALLER_AIP.name}")
         resync_appdir(advinst)
         if args.dev:
-            version = msi_version(args.version_override or scenedetect.__version__)
-            dev_name = f"PySceneDetect-{version}-dev-win64.msi"
+            raw_version = args.version_override or scenedetect.__version__
+            file_version = display_version(raw_version)
+            dev_name = f"PySceneDetect-{file_version}-dev-win64.msi"
             print(f"Renaming MSI package to {dev_name} (dev build)")
             run(advinst, "/SetPackageName", dev_name, "-buildname", "DefaultBuild")
         return
 
     raw_version = args.version_override or scenedetect.__version__
-    version = msi_version(raw_version)
-    if version != raw_version:
-        print(f"Normalized {raw_version!r} -> {version!r} for AdvancedInstaller")
-    print(f"Bumping {INSTALLER_AIP.name} to {version}")
-
-    run(advinst, "/SetVersion", version)
+    product_version = msi_version(raw_version)
+    file_version = display_version(raw_version)
+    if not all(p.isdigit() for p in product_version.split(".") if p):
+        sys.exit(f"Cannot derive numeric MSI version from {raw_version!r}")
+    if product_version != raw_version:
+        print(f"Normalized {raw_version!r} -> {product_version!r} for AdvancedInstaller")
+    print(f"Bumping {INSTALLER_AIP.name} to {product_version} (filename: {file_version})")
+
+    run(advinst, "/SetVersion", product_version)
     run(advinst, "/SetProductCode", "-langid", "1033")
     run(
         advinst,
         "/SetPackageName",
-        f"PySceneDetect-{version}-win64.msi",
+        f"PySceneDetect-{file_version}-win64.msi",
         "-buildname",
         "DefaultBuild",
     )

scripts/validate_release.py

@@ -48,16 +48,16 @@
 sys.path.insert(0, str(Path(__file__).resolve().parent))
 
 from _release_common import (  # noqa: E402
+    display_version,
     find_7zip,
     hash_zip_contents,
-    msi_version,
     sha256_file,
     verify_authenticode,
 )
 
 import scenedetect  # noqa: E402
 
-VERSION = msi_version(scenedetect.__version__)
+VERSION = display_version(scenedetect.__version__)
 
 # Mirrors `third_party_packages` in `scenedetect/platform.py:get_system_version_info()`.
 # Keep these two lists in sync: any package added there should be classified here as
@@ -313,10 +313,9 @@ def check_frozen_exe(portable_zip: Path) -> None:
             fail(f"`scenedetect.exe version` exited {result.returncode}\n{result.stderr}")
         packages = _parse_packages_section(result.stdout)
         scenedetect_reported = packages.get("scenedetect", "")
-        # Normalize both sides through msi_version() so a raw __version__ of "0.7"
-        # matches the artifact-name VERSION of "0.7.0" (mirrors the same
-        # normalization scripts/update_installer.py applies to filenames).
-        if msi_version(scenedetect_reported) != VERSION:
+        # Normalize both sides through display_version() so a raw __version__
+        # like "0.7-dev0" matches the artifact-name VERSION of "0.7".
+        if display_version(scenedetect_reported) != VERSION:
             fail(
                 f"`scenedetect.exe version` reports scenedetect=={scenedetect_reported!r}, "
                 f"expected {VERSION!r} (raw __version__ normalized)"