Skip to content

Commit a160a49

Browse files
committed
More places in DS code to bypass conda run (#9467)
For #9444 Found two more places where we could end up using conda run. Bypass this as well to ensure we use activated environment variables instead, we know this is guaranteed to work. This is all that's remaining as far as I know where DS code is using conda run. We know at least from one user that conda run has failed to get list of kernels.
1 parent bb92e98 commit a160a49

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/client/datascience/jupyter/jupyterCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class InterpreterJupyterCommand implements IJupyterCommand {
9393
}
9494
}
9595
}
96-
return pythonExecutionFactory.createActivatedEnvironment({ interpreter: this._interpreter });
96+
return pythonExecutionFactory.createActivatedEnvironment({ interpreter: this._interpreter, bypassCondaExecution: true });
9797
});
9898
}
9999
public interpreter(): Promise<PythonInterpreter | undefined> {

src/client/datascience/jupyter/jupyterCommandFinder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ export class JupyterCommandFinderImpl {
368368
private async createExecutionService(interpreter: PythonInterpreter): Promise<IPythonExecutionService> {
369369
const [currentInterpreter, pythonService] = await Promise.all([
370370
this.interpreterService.getActiveInterpreter(undefined),
371-
this.executionFactory.createActivatedEnvironment({ resource: undefined, interpreter, allowEnvironmentFetchExceptions: true })
371+
this.executionFactory.createActivatedEnvironment({ resource: undefined, interpreter, allowEnvironmentFetchExceptions: true, bypassCondaExecution: true })
372372
]);
373373

374374
// Use daemons for current interpreter, when using any other interpreter, do not use a daemon.

0 commit comments

Comments
 (0)