diff --git a/scripts/generate_pack.py b/scripts/generate_pack.py index f399a4fa..f57c1032 100644 --- a/scripts/generate_pack.py +++ b/scripts/generate_pack.py @@ -583,7 +583,6 @@ def generate_pack( db: dict, bios_dir: str, output_dir: str, - include_extras: bool = False, emulators_dir: str = "emulators", zip_contents: dict | None = None, data_registry: dict | None = None, @@ -2353,7 +2352,6 @@ def _run_platform_packs( db, args.bios_dir, args.output_dir, - include_extras=args.include_extras, emulators_dir=args.emulators_dir, zip_contents=zip_contents, data_registry=data_registry, @@ -2590,11 +2588,6 @@ def main(): parser.add_argument("--db", default=DEFAULT_DB_FILE, help="Path to database.json") parser.add_argument("--bios-dir", default=DEFAULT_BIOS_DIR) parser.add_argument("--output-dir", "-o", default=DEFAULT_OUTPUT_DIR) - parser.add_argument( - "--include-extras", - action="store_true", - help="(no-op) Core requirements are always included", - ) parser.add_argument("--emulators-dir", default="emulators") parser.add_argument( "--offline", diff --git a/scripts/pipeline.py b/scripts/pipeline.py index b854a129..9c8357cb 100644 --- a/scripts/pipeline.py +++ b/scripts/pipeline.py @@ -317,12 +317,6 @@ def main(): parser.add_argument( "--output-dir", default="dist", help="Pack output directory (default: dist/)" ) - # --include-extras is now a no-op: core requirements are always included - parser.add_argument( - "--include-extras", - action="store_true", - help="(no-op) Core requirements are always included", - ) parser.add_argument("--target", "-t", help="Hardware target (e.g., switch, rpi4)") parser.add_argument("--source", choices=["platform", "truth", "full"], default="full") parser.add_argument("--all-variants", action="store_true") @@ -525,8 +519,6 @@ def main(): pack_cmd.append("--include-archived") if args.offline: pack_cmd.append("--offline") - if args.include_extras: - pack_cmd.append("--include-extras") if args.target: pack_cmd.extend(["--target", args.target]) if args.source != "full": diff --git a/tests/test_directory_entries.py b/tests/test_directory_entries.py index 814667e1..afa52ab5 100644 --- a/tests/test_directory_entries.py +++ b/tests/test_directory_entries.py @@ -201,7 +201,7 @@ class PackCarriesADirectory(DirectoryFixture): out.mkdir() zip_path = builder.generate_pack( "demo", str(self.platforms), self._db(), str(self.bios), str(out), - include_extras=True, emulators_dir=str(self.emulators), + emulators_dir=str(self.emulators), emu_profiles=profiles, offline=True, ) with zipfile.ZipFile(zip_path) as archive: diff --git a/tests/test_e2e.py b/tests/test_e2e.py index b6167ee7..05222791 100644 --- a/tests/test_e2e.py +++ b/tests/test_e2e.py @@ -6018,6 +6018,9 @@ struct BurnDriver BurnDrvneogeo = { (["--from-md5", "d8f1"], ["--include-archived"], "refuse"), (["--platform", "retroarch", "--verify-packs"], ["--include-archived"], "refuse"), + # Documented as adding core files, read by nothing. + (["--emulator", "handy"], ["--include-extras"], "refuse"), + (["--system", "atari-lynx"], ["--include-extras"], "refuse"), ] for mode, flag, expected in matrix: with self.subTest(mode=mode, flag=flag): diff --git a/tests/test_pack_counts.py b/tests/test_pack_counts.py index dddfb6a5..32924aee 100644 --- a/tests/test_pack_counts.py +++ b/tests/test_pack_counts.py @@ -123,7 +123,7 @@ class ManifestStatesWhatThePackHolds(PackCountFixture): out.mkdir() zip_path = builder.generate_pack( "demo", str(self.platforms), self.db, str(self.bios), str(out), - include_extras=True, emulators_dir=str(self.emulators), + emulators_dir=str(self.emulators), emu_profiles=self.profiles, data_registry=self.registry, offline=True, ) @@ -184,7 +184,7 @@ class ManifestFollowsTheBuilder(PackCountFixture): out.mkdir(exist_ok=True) zip_path = builder.generate_pack( "demo", str(self.platforms), self.db, str(self.bios), str(out), - include_extras=True, emulators_dir=str(self.emulators), + emulators_dir=str(self.emulators), emu_profiles=self.profiles, data_registry=self.registry, offline=True, ) diff --git a/tests/test_pack_failures.py b/tests/test_pack_failures.py index 9d6c897d..5e73ac68 100644 --- a/tests/test_pack_failures.py +++ b/tests/test_pack_failures.py @@ -38,7 +38,7 @@ class FailedPlatformFailsTheRun(unittest.TestCase): return argparse.Namespace( all_variants=False, source="full", required_only=False, platforms_dir="platforms", target=None, split=False, - include_extras=False, emulators_dir="emulators", regions=[], + emulators_dir="emulators", regions=[], one_per_slot=False, offline=True, bios_dir="bios", output_dir=self.tmp.name, verify_packs=False, ) diff --git a/tests/test_verify_pack_choice.py b/tests/test_verify_pack_choice.py index dc1b902e..17ca00d9 100644 --- a/tests/test_verify_pack_choice.py +++ b/tests/test_verify_pack_choice.py @@ -119,7 +119,7 @@ class GroupRenameKeepsSystemTag(unittest.TestCase): args = argparse.Namespace( all_variants=False, source="full", required_only=False, platforms_dir="platforms", target=None, split=False, - include_extras=False, emulators_dir="emulators", regions=[], + emulators_dir="emulators", regions=[], one_per_slot=False, offline=True, bios_dir="bios", output_dir=tmp, ) diff --git a/wiki/tools.md b/wiki/tools.md index 2e2a85d8..d834fef7 100644 --- a/wiki/tools.md +++ b/wiki/tools.md @@ -190,8 +190,6 @@ would have loaded. region is kept whole rather than emptied - `--one-per-slot`: keep one file per system and declared region, ranked by the `priority:` the emulator source states, lowest first -- `--include-extras`: with `--emulator` or `--system`, add the files the cores - pull in beyond the selection - `--db`, `--platforms-dir`, `--emulators-dir`: read another database or source tree instead of the repository's - `--source {platform,truth,full}`: select file source (platform YAML only, emulator profiles only, or both)