Merge branch 'fix/install-skip-pycache' into unify/skills-20261112-night
This commit is contained in:
commit
92f5087eed
4 files changed
+39
-9
No files matched your search
+26
-2
@@ -11,18 +11,22 @@ from pathlib import Path
|
||||
|
||||
INSTALL = Path(__file__).resolve().parents[1] / "scripts" / "install.sh"
|
||||
NPX = "#!/bin/sh\nmkdir -p .agents/skills/locked\necho locked > .agents/skills/locked/SKILL.md\n"
|
||||
BYTECODE = ("__pycache__/radio.cpython-312.pyc", "json.pyc", "legacy.pyo")
|
||||
|
||||
|
||||
class TestInstall(unittest.TestCase):
|
||||
def install(self, root: Path, target: Path) -> None:
|
||||
def install(self, root: Path, target: Path, npx: str = NPX, planted: tuple[str, ...] = ()) -> None:
|
||||
repo, stubs = root / "repo", root / "bin"
|
||||
(repo / "scripts").mkdir(parents=True)
|
||||
shutil.copy(INSTALL, repo / "scripts" / "install.sh")
|
||||
(repo / "scripts" / "enable-plugins.js").write_text("", encoding="utf-8")
|
||||
(repo / "skills" / "own").mkdir(parents=True)
|
||||
(repo / "skills" / "own" / "SKILL.md").write_text("own", encoding="utf-8")
|
||||
for name in planted:
|
||||
(repo / name).parent.mkdir(parents=True, exist_ok=True)
|
||||
(repo / name).write_bytes(b"planted")
|
||||
stubs.mkdir()
|
||||
(stubs / "npx").write_text(NPX, encoding="utf-8")
|
||||
(stubs / "npx").write_text(npx, encoding="utf-8")
|
||||
(stubs / "npx").chmod(0o755)
|
||||
env = {**os.environ, "PATH": f"{stubs}:/usr/bin:/bin", "TARGET": str(target), "HOME": str(root / "home")}
|
||||
done = subprocess.run(["bash", str(repo / "scripts" / "install.sh")], env=env, capture_output=True, text=True, check=False)
|
||||
@@ -55,6 +59,26 @@ class TestInstall(unittest.TestCase):
|
||||
expected = {name: root / "home" / folder / name if f"{folder}/{name}" in linked else None for name in ("locked", "own")}
|
||||
self.assertEqual(installed, expected)
|
||||
|
||||
def test_no_python_bytecode_reaches_the_installed_skills(self):
|
||||
locked = "".join(f"echo planted > .agents/skills/locked/scripts/{name}\n" for name in BYTECODE)
|
||||
npx = f"{NPX}mkdir -p .agents/skills/locked/scripts/__pycache__\n{locked}"
|
||||
for linked in (False, True):
|
||||
with self.subTest(linked=linked), tempfile.TemporaryDirectory() as tmp:
|
||||
root = Path(tmp)
|
||||
target = root / "target"
|
||||
(target / ".agents" / "skills").mkdir(parents=True)
|
||||
if linked:
|
||||
(target / ".claude").mkdir()
|
||||
(target / ".claude" / "skills").symlink_to(Path("..") / ".agents" / "skills")
|
||||
self.install(root, target, npx, (*(f"skills/own/scripts/{name}" for name in BYTECODE), "skills/own/scripts/radio.py"))
|
||||
for folder in (".agents/skills", ".claude/skills"):
|
||||
installed = target / folder
|
||||
with self.subTest(folder=folder):
|
||||
bytecode = [str(path.relative_to(installed)) for path in sorted(installed.rglob("*")) if path.name == "__pycache__" or path.suffix in (".pyc", ".pyo")]
|
||||
self.assertEqual(bytecode, [])
|
||||
self.assertTrue((installed / "own" / "scripts" / "radio.py").is_file())
|
||||
self.assertTrue((installed / "locked" / "SKILL.md").is_file())
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -212,12 +212,17 @@ class TestOrchestratorMigration(unittest.TestCase):
|
||||
self.assertIn("Environment=PATH=/usr/bin:/bin", unit.read_text(encoding="utf-8").splitlines())
|
||||
|
||||
def test_install_ships_no_bytecode_from_the_tree(self):
|
||||
planted = REPO_ROOT / "orchestrator" / "client" / "__pycache__" / "planted.cpython-0.pyc"
|
||||
planted.parent.mkdir(exist_ok=True)
|
||||
planted.write_bytes(b"planted")
|
||||
self.addCleanup(planted.unlink, True)
|
||||
client = REPO_ROOT / "orchestrator" / "client"
|
||||
if not (client / "__pycache__").exists():
|
||||
(client / "__pycache__").mkdir()
|
||||
self.addCleanup(shutil.rmtree, client / "__pycache__", True)
|
||||
for planted in (client / "__pycache__" / "planted.cpython-0.pyc", client / "planted.pyc", client / "planted.pyo"):
|
||||
planted.write_bytes(b"planted")
|
||||
self.addCleanup(planted.unlink, True)
|
||||
self.install()
|
||||
self.assertEqual(sorted((self.home / ".local" / "share" / NEW).rglob("__pycache__")), [])
|
||||
hub = self.home / ".local" / "share" / NEW
|
||||
self.assertEqual(sorted(path for path in hub.rglob("*") if path.name == "__pycache__" or path.suffix in (".pyc", ".pyo")), [])
|
||||
self.assertTrue((hub / "client" / "permission_hook.py").is_file())
|
||||
|
||||
def test_old_names_live_only_in_the_migration(self):
|
||||
done = subprocess.run(["git", "grep", "-niE", "kvb[-_]hub", "--", ".", ":!docs/requirements", f":!{Path(__file__).relative_to(REPO_ROOT)}"], cwd=REPO_ROOT, capture_output=True, text=True, check=False)
|
||||
|
||||
Reference in new issue
Block a user