Skip to content

Commit bb92e98

Browse files
committed
Bypass conda service when creating daemons (#9454)
* Bypass conda run for DS code
1 parent 4efab57 commit bb92e98

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/client/datascience/jupyter/notebookStarter.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,9 @@ export class NotebookStarter implements Disposable {
243243
// Create a daemon only when using the current interpreter.
244244
// We dont' want to create daemons for all interpreters.
245245
const isActiveInterpreter = activeInterpreter ? activeInterpreter.path === interpreter.path : false;
246-
const daemon = await (isActiveInterpreter ?
247-
this.executionFactory.createDaemon({ daemonModule: PythonDaemonModule, pythonPath: interpreter.path }) :
248-
this.executionFactory.createActivatedEnvironment({allowEnvironmentFetchExceptions: true, interpreter})
249-
);
246+
const daemon = await (isActiveInterpreter
247+
? this.executionFactory.createDaemon({ daemonModule: PythonDaemonModule, pythonPath: interpreter.path })
248+
: this.executionFactory.createActivatedEnvironment({ allowEnvironmentFetchExceptions: true, interpreter, bypassCondaExecution: true }));
250249
// We have a small python file here that we will execute to get the server info from all running Jupyter instances
251250
const newOptions: SpawnOptions = { mergeStdOutErr: true, token: cancelToken };
252251
const file = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'datascience', 'getServerInfo.py');

0 commit comments

Comments
 (0)