Skip to content

More places in DS code to bypass conda run #9467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2020
Merged

More places in DS code to bypass conda run #9467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/datascience/jupyter/jupyterCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class InterpreterJupyterCommand implements IJupyterCommand {
}
}
}
return pythonExecutionFactory.createActivatedEnvironment({ interpreter: this._interpreter });
return pythonExecutionFactory.createActivatedEnvironment({ interpreter: this._interpreter, bypassCondaExecution: true });
});
}
public interpreter(): Promise<PythonInterpreter | undefined> {
Expand Down
2 changes: 1 addition & 1 deletion src/client/datascience/jupyter/jupyterCommandFinder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ export class JupyterCommandFinderImpl {
private async createExecutionService(interpreter: PythonInterpreter): Promise<IPythonExecutionService> {
const [currentInterpreter, pythonService] = await Promise.all([
this.interpreterService.getActiveInterpreter(undefined),
this.executionFactory.createActivatedEnvironment({ resource: undefined, interpreter, allowEnvironmentFetchExceptions: true })
this.executionFactory.createActivatedEnvironment({ resource: undefined, interpreter, allowEnvironmentFetchExceptions: true, bypassCondaExecution: true })
]);

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