Fix PYTHONPATH usage

versatica · Nov 27, 2023 · 7992108 · 7992108
1 parent 482562c
commit 7992108
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/npm-scripts.mjs b/npm-scripts.mjs
@@ -10,7 +10,7 @@ const PKG = JSON.parse(fs.readFileSync('./package.json').toString());
 const IS_WINDOWS = os.platform() === 'win32';
 const MAYOR_VERSION = PKG.version.split('.')[0];
 const PYTHON = getPython();
-const PIP_INVOKE_DIR = 'worker/pip_invoke';
+const PIP_INVOKE_DIR = path.resolve('worker/pip_invoke');
 const INVOKE_VERSION = process.env.INVOKE_VERSION ?? '2.2.0';
 const FLATBUFFERS_VERSION = '23.3.3';
 const WORKER_RELEASE_DIR = 'worker/out/Release';
@@ -26,13 +26,20 @@ const task = process.argv.slice(2).join(' ');
 
 // PYTHONPATH env must be updated now so all invoke calls below will find the
 // pip invoke module.
-if (IS_WINDOWS)
+if (process.env.PYTHONPATH)
 {
-	process.env.PYTHONPATH = `${PIP_INVOKE_DIR};${process.env.PYTHONPATH}`;
+	if (IS_WINDOWS)
+	{
+		process.env.PYTHONPATH = `${PIP_INVOKE_DIR};${process.env.PYTHONPATH}`;
+	}
+	else
+	{
+		process.env.PYTHONPATH = `${PIP_INVOKE_DIR}:${process.env.PYTHONPATH}`;
+	}
 }
 else
 {
-	process.env.PYTHONPATH = `${PIP_INVOKE_DIR}:${process.env.PYTHONPATH}`;
+	process.env.PYTHONPATH = PIP_INVOKE_DIR;
 }
 
 run();

diff --git a/worker/Makefile b/worker/Makefile
@@ -48,7 +48,7 @@ invoke:
 ifeq ($(wildcard $(PIP_INVOKE_DIR)),)
 	# Install pip invoke into custom location, so we don't depend on system-wide
 	# installation.
-	$(PYTHON) -m pip install --upgrade --target=$(PIP_INVOKE_DIR) invoke==$(INVOKE_VERSION)
+	$(PYTHON) -m pip install --upgrade --target="$(PIP_INVOKE_DIR)" invoke==$(INVOKE_VERSION)
 endif
 
 meson-ninja: invoke

diff --git a/worker/tasks.py b/worker/tasks.py
@@ -31,6 +31,8 @@
 MEDIASOUP_OUT_DIR = os.getenv('MEDIASOUP_OUT_DIR') or f'{WORKER_DIR}/out';
 MEDIASOUP_INSTALL_DIR = os.getenv('MEDIASOUP_INSTALL_DIR') or f'{MEDIASOUP_OUT_DIR}/{MEDIASOUP_BUILDTYPE}';
 BUILD_DIR = os.getenv('BUILD_DIR') or f'{MEDIASOUP_INSTALL_DIR}/build';
+# Custom pip folder for invoke package.
+PIP_INVOKE_DIR = f'{MEDIASOUP_OUT_DIR}/pip_invoke';
 # Custom pip folder for meson and ninja packages.
 PIP_MESON_NINJA_DIR = f'{MEDIASOUP_OUT_DIR}/pip_meson_ninja';
 # Custom pip folder for pylint package.
@@ -57,7 +59,6 @@
 # https://github.com/ninja-build/ninja/issues/2211
 # https://github.com/ninja-build/ninja/issues/2212
 NINJA_VERSION = os.getenv('NINJA_VERSION') or '1.10.2.4';
-PYLINT = f'{PIP_PYLINT_DIR}/bin/pylint';
 PYLINT_VERSION = os.getenv('PYLINT_VERSION') or '3.0.2';
 NPM = os.getenv('NPM') or 'npm';
 LCOV = f'{WORKER_DIR}/deps/lcov/bin/lcov';
@@ -84,9 +85,9 @@
 # NOTE: On Windows we must use ; instead of : to separate paths.
 PYTHONPATH = os.getenv('PYTHONPATH') or '';
 if os.name == 'nt':
-    os.environ['PYTHONPATH'] = f'{PIP_MESON_NINJA_DIR};{PIP_PYLINT_DIR};{PYTHONPATH}';
+    os.environ['PYTHONPATH'] = f'{PIP_INVOKE_DIR};{PIP_MESON_NINJA_DIR};{PIP_PYLINT_DIR};{PYTHONPATH}';
 else:
-    os.environ['PYTHONPATH'] = f'{PIP_MESON_NINJA_DIR}:{PIP_PYLINT_DIR}:{PYTHONPATH}';
+    os.environ['PYTHONPATH'] = f'{PIP_INVOKE_DIR}:{PIP_MESON_NINJA_DIR}:{PIP_PYLINT_DIR}:{PYTHONPATH}';
 
 
 @task
@@ -365,7 +366,7 @@ def lint(ctx):
             shell=SHELL
         );
 
-    if not os.path.isfile(PYLINT):
+    if not os.path.isdir(PIP_PYLINT_DIR):
         # Install pylint using pip into our custom location.
         ctx.run(
             f'"{PYTHON}" -m pip install --upgrade --target="{PIP_PYLINT_DIR}" pylint=={PYLINT_VERSION}',