From 9e5d5e867920282f7a5d9dc767b4955e294fe5d4 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@yahoo.com>
Date: Wed, 8 Jan 2020 17:00:59 -0800
Subject: [PATCH] More places to bypass conda run

---
 src/client/datascience/jupyter/jupyterCommand.ts       | 2 +-
 src/client/datascience/jupyter/jupyterCommandFinder.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/datascience/jupyter/jupyterCommand.ts b/src/client/datascience/jupyter/jupyterCommand.ts
index 2633a74306f5..6eebc96e08a1 100644
--- a/src/client/datascience/jupyter/jupyterCommand.ts
+++ b/src/client/datascience/jupyter/jupyterCommand.ts
@@ -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> {
diff --git a/src/client/datascience/jupyter/jupyterCommandFinder.ts b/src/client/datascience/jupyter/jupyterCommandFinder.ts
index ea68a5a5e107..3c03a74d743d 100644
--- a/src/client/datascience/jupyter/jupyterCommandFinder.ts
+++ b/src/client/datascience/jupyter/jupyterCommandFinder.ts
@@ -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.