diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/mypy/MypyAnalysis.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/mypy/MypyAnalysis.java index e6858bee7f..52abc6a294 100644 --- a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/mypy/MypyAnalysis.java +++ b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/mypy/MypyAnalysis.java @@ -204,7 +204,10 @@ void createMypyProcess(IExternalCodeAnalysisStream out) } } } + + String mypyPath = StringUtils.join(SimpleRunner.getPythonPathSeparator(), addToMypyPath); if (addToMypyPath.size() > 0) { + WriteToStreamHelper.write("MyPy: Using MYPYPATH:", out, mypyPath); updateEnv = new ICallback() { @Override @@ -213,14 +216,14 @@ public String[] call(String[] arg) { // Update var if (arg[i].startsWith("MYPYPATH=")) { arg[i] = arg[i] + SimpleRunner.getPythonPathSeparator() - + StringUtils.join(SimpleRunner.getPythonPathSeparator(), addToMypyPath); + + mypyPath; return arg; } } // Create new var. return ArrayUtils.concatArrays(arg, new String[] { - "MYPYPATH=" + StringUtils.join(SimpleRunner.getPythonPathSeparator(), addToMypyPath) }); + "MYPYPATH=" + mypyPath }); } }; } @@ -241,9 +244,9 @@ public String[] call(String[] arg) { } cmdList.add(0, "mypy"); String[] args = cmdList.toArray(new String[0]); - WriteToStreamHelper.write("MyPy: Executing command line:", out, "python", "-m", args); SimplePythonRunner runner = new SimplePythonRunner(); String[] parameters = SimplePythonRunner.preparePythonCallParameters(interpreter, "-m", args); + WriteToStreamHelper.write("MyPy: Executing command line:", out, StringUtils.join(" ", parameters)); Tuple r = runner.run(parameters, workingDir, nature, monitor, finalUpdateEnv); return r.o1; diff --git a/pom.xml b/pom.xml index 043ea40ee8..623faf044e 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 4.0.3 UTF-8 eclipse-2023-12 - https://download.eclipse.org/releases/2023-12/ + https://download.eclipse.org/releases/2024-03/ 3.9.5