Cleanup

tests/test_formatting.py

@@ -1,3 +1,6 @@
+import modulus.container
+import modulus.build_context
+import modulus.clangd
 import ast
 import contextlib
 import io
@@ -114,13 +117,13 @@ class formatting_test(unittest.TestCase):
   def test_stdin_failure_has_no_output_and_never_builds_image(self):
     with tempfile.TemporaryDirectory() as directory:
       root = pathlib.Path(directory)
-      context = modulus.cli.build_context(root, modulus.config.normalize({"package": {"name": "sample"}}))
+      context = modulus.build_context.build_context(root, modulus.config.normalize({"package": {"name": "sample"}}))
       context.docker_marker = root / "not-in-container"
       output, errors = io.StringIO(), io.StringIO()
       with patch.dict(os.environ, {"MODULUS_DIRECT": "1"}), patch("sys.stdin", io.StringIO("def broken(")), contextlib.redirect_stdout(output), contextlib.redirect_stderr(errors):
         self.assertEqual(modulus.formatting.launch(context, ["--stdin-filename", "test.py"]), 1)
       self.assertEqual(output.getvalue(), "")
-      with patch.dict(os.environ, {"MODULUS_DIRECT": "0"}), patch.object(modulus.clangd, "current_image", return_value=None), patch.object(modulus.cli, "ensure_build_image") as build, contextlib.redirect_stderr(errors):
+      with patch.dict(os.environ, {"MODULUS_DIRECT": "0"}), patch.object(modulus.container, "current_image", return_value=None), patch.object(modulus.container, "ensure_build_image") as build, contextlib.redirect_stderr(errors):
         self.assertEqual(modulus.formatting.launch(context, ["--check"]), 1)
       build.assert_not_called()
   def test_discovery_excludes_generated_and_symlinks(self):
@@ -142,7 +145,7 @@ class formatting_test(unittest.TestCase):
     source = 'def example(name):\n  return f"""first {name}\n\nsecond\n\nthird"""\n'
     self.assertEqual(self.formatted(source, ".py"), source)
   def test_alias_check_distinguishes_module_aliases_from_saved_callbacks(self):
-    source = 'import modulus.cli\nsaved = modulus.cli.docker_run\nconfig = modulus.cli\nItems = list[int]\n'
+    source = 'import modulus.cli\nsaved = modulus.container.docker_run\nconfig = modulus.cli\nItems = list[int]\n'
     self.assertEqual([line for line, _ in modulus.format_layout.alias_diagnostics(source, ".py")], [3, 4])
   def test_exported_stdin_formatter_needs_no_compile_database(self):
     with tempfile.TemporaryDirectory() as directory: