Cleanup

tests/test_python.py

@@ -1,3 +1,5 @@
+import modulus.build_context
+import modulus.process
 import pathlib
 import subprocess
 import sys
@@ -5,13 +7,12 @@ import tempfile
 import unittest
 import unittest.mock
 
-import modulus.cli
 import modulus.config
 import modulus.python
 
 class PythonTests(unittest.TestCase):
   def context(self, root, groups):
-    return modulus.cli.build_context(root, modulus.config.normalize({'package': {'name': 'example'}, 'tooling': {'python': {'groups': groups}}}))
+    return modulus.build_context.build_context(root, modulus.config.normalize({'package': {'name': 'example'}, 'tooling': {'python': {'groups': groups}}}))
   def test_optional_packages_are_not_needed_by_default(self):
     with tempfile.TemporaryDirectory() as temporary, unittest.mock.patch.object(subprocess, 'run') as run:
       context = self.context(pathlib.Path(temporary), [])
@@ -20,10 +21,10 @@ class PythonTests(unittest.TestCase):
   def test_conan_reuses_the_project_environment_and_preserves_offline_mode(self):
     with tempfile.TemporaryDirectory() as temporary:
       context = self.context(pathlib.Path(temporary), ['assets'])
-      environment = modulus.cli.subprocess_environment(context, ['conan', 'install', '.', '--no-remote'])
+      environment = modulus.process.subprocess_environment(context, ['conan', 'install', '.', '--no-remote'])
       self.assertEqual(environment['MODULUS_PYTHON_COMMON_DIR'], str(context.common_dir))
       self.assertEqual(environment['MODULUS_PYTHON_OFFLINE'], '1')
-      environment = modulus.cli.subprocess_environment(context, ['conan', 'install', '.'])
+      environment = modulus.process.subprocess_environment(context, ['conan', 'install', '.'])
       self.assertEqual(environment['MODULUS_PYTHON_OFFLINE'], '0')
   def test_missing_dependencies_require_configure_and_never_download_during_build(self):
     with tempfile.TemporaryDirectory() as temporary, unittest.mock.patch.object(subprocess, 'run') as run: