.

Author: sbc100

bootstrap.py

@@ -41,7 +41,7 @@
    ], ['git', 'submodule', 'update', '--init']),
   ('pip install', [
      'requirements-dev.txt',
-   ], [sys.executable, '-m', 'pip', 'install', '--root', 'out/python_deps', '-r', 'requirements-dev.txt']),
+   ], [sys.executable, '-m', 'pip', 'install', '--target', 'out/python_deps', '-r', 'requirements-dev.txt']),
 ]
 
 
@@ -88,8 +88,8 @@ def main(args):
     return 0
 
   env = os.environ.copy()
-  env['PATH'] += os.pathsep + utils.path_from_root('out/python_deps')
-  env['PYTHONPATH'] = utils.path_from_root('out/python_deps')
+  env['PATH'] += os.pathsep + utils.path_from_root('out/python_deps/bin')
+  env['PYTHONPATH'] = 'out/python_deps'
 
   for name, deps, cmd in actions:
     if check_deps(name, deps):

emcc.py

@@ -57,6 +57,21 @@
   import bootstrap
   bootstrap.check()
 
+
+def check_python_path():
+  # When testing emscripten we install test-only python dependecies in `out/python_deps`.
+  # However, these should never become dependnecies of emscripten itself, so we assert here
+  # that we cannot use them, to keep honest
+  root = os.path.normpath(utils.path_from_root())
+  for p in sys.path:
+    p = os.path.normpath(p)
+    assert 'python_deps' not in p
+    if p != root and p != os.path.join(root, 'third_party'):
+      assert not p.startswith(root), f'unexpected element in python path: {p}'
+
+
+check_python_path()
+
 PREPROCESSED_EXTENSIONS = {'.i', '.ii'}
 ASSEMBLY_EXTENSIONS = {'.s'}
 HEADER_EXTENSIONS = {'.h', '.hxx', '.hpp', '.hh', '.H', '.HXX', '.HPP', '.HH'}