Data Files

tests/test_build_bootstrap.py

@@ -12,9 +12,10 @@ class BuildBootstrapTests(unittest.TestCase):
     spec = importlib.util.spec_from_file_location('vamp_bootstrap', root / 'modulus.py')
     bootstrap = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(bootstrap)
-    digest = hashlib.sha256((root / 'tools/requirements.txt').read_bytes()).hexdigest()
+    digest = hashlib.sha256((root / 'generator/requirements.txt').read_bytes()).hexdigest()
     self.assertEqual(bootstrap.build_requirements_digest(), digest)
     self.assertIn(f'build-requirements="{digest}"', bootstrap.product_build_dockerfile())
+    self.assertIn('COPY generator/requirements.txt /tmp/vamp-build-requirements.txt', bootstrap.product_build_dockerfile())
     package = types.ModuleType('modulus')
     cli = types.ModuleType('modulus.cli')
     package.cli = cli

tests/test_score_generator.py

@@ -8,7 +8,7 @@ import tempfile
 from pathlib import Path
 
 from generator.__main__ import copy_runtime_fonts
-from tools import generate_pico_font
+from generator import generate_pico_font
 
 class FontAssetsTests(unittest.TestCase):
   def test_font_generator_requires_kerning_backend(self):
@@ -26,8 +26,8 @@ class FontAssetsTests(unittest.TestCase):
     root = Path(__file__).resolve().parents[1]
     with tempfile.TemporaryDirectory() as directory:
       output = Path(directory) / "generated/font.cpp"
-      command = [sys.executable, str(root / "tools/generate_pico_font.py"), "--output", str(output)]
-      subprocess.run(command, check=True, capture_output=True, text=True)
+      command = [sys.executable, str(root / "generator/generate_pico_font.py"), "--output", str(output)]
+      subprocess.run(command, check=True, capture_output=True, text=True, cwd=directory)
       self.assertNotIn("std::array<pair_adjustment, 0>", output.read_text(encoding="utf-8"))
       before = output.stat().st_mtime_ns
       subprocess.run([*command, "--check"], check=True, capture_output=True, text=True)