working PYTHONPATH

Author: TakenPilot

build/install-spinner.gif

@@ -8,11 +8,29 @@ import path from 'path';
 const rootAppDir = process.resourcesPath,
   condaDirName = 'conda',
   condaDir = path.join(rootAppDir, condaDirName),
+  dllDir = path.join(rootAppDir, condaDirName, 'DLLs'),
   libDir = path.join(rootAppDir, condaDirName, 'Lib'),
+  sitePackagesDir = path.join(rootAppDir, condaDirName, 'Lib', 'site-packages'),
   scriptsDir = path.join(rootAppDir, condaDirName, 'Scripts');
 
 console.log({rootAppDir, condaDirName, condaDir, libDir, scriptsDir, dirname: __dirname});
 
+function splitList(list) {
+  if (process.platform === 'win32') {
+    return list.split(';');
+  } else {
+    return list.split(':');
+  }
+}
+
+function joinList(list) {
+  if (process.platform === 'win32') {
+    return list.join(';');
+  } else {
+    return list.join(':');
+  }
+}
+
 function prependToPath(fullPath, pathPart) {
   if (!_.includes(fullPath, pathPart)) {
     fullPath.unshift(pathPart);
@@ -42,31 +60,43 @@ function addBonusVariables(env) {
 function prependBuiltinPath(env) {
   const myPath = getPath(env);
 
-  prependToPath(myPath, condaDir);
-  prependToPath(myPath, libDir);
   prependToPath(myPath, scriptsDir);
+  prependToPath(myPath, libDir);
+  prependToPath(myPath, condaDir);
 
   return setPath(env, myPath);
 }
 
+function addOurPythonPath(env) {
+  if (process.platform === 'win32') {
+    const list = env.PYTHONPATH ? splitList(env.PYTHONPATH) : [];
+
+    prependToPath(list, sitePackagesDir);
+    prependToPath(list, libDir);
+    prependToPath(list, dllDir);
+
+    env.PYTHONPATH = joinList([dllDir, libDir, sitePackagesDir], list);
+  }
+
+  return env;
+}
+
 function applyBuiltinPython(env) {
   const useBuiltinPython = local.get('useBuiltinPython') || 'failover',
-    hasPythonFailedOver = session.get('hasPythonFailedOver') || false;
+    hasPythonFailedOver = session.get('hasPythonFailedOver') || false,
+    hasPythonPath = env.PYTHONPATH;
 
-  if (useBuiltinPython === 'yes' || (hasPythonFailedOver && useBuiltinPython === 'failover')) {
+  if (!hasPythonPath || useBuiltinPython === 'yes' || (hasPythonFailedOver && useBuiltinPython === 'failover')) {
+    addOurPythonPath(env);
     env = prependBuiltinPath(env);
   }
 
   return env;
 }
 
 function getEnvironmentVariables(env) {
-
-  console.log('what, HUH?', env);
-
   if (!env) {
     env = local.get('environmentVariables');
-    console.log('wait, WHY?', env);
   }
 
   if (env) {
@@ -94,11 +124,7 @@ function getPath(env) {
   let result;
 
   if (path) {
-    if (process.platform === 'win32') {
-      result = path.split(';');
-    } else {
-      result = path.split(':');
-    }
+    result = splitList(path);
   } else {
     result = [];
   }
@@ -108,28 +134,23 @@ function getPath(env) {
 
 function setExistingPath(env, value) {
   if (env.PATH) {
-    env.PATH = value;
+    delete value.PATH;
   } else if (env.Path) {
-    env.Path = value;
+    delete value.Path;
   } else if (env.path) {
-    env.path = value;
-  } else {
-    // most OS's use all capitals, and if this is not set, the user has done something WEIRD
-    env.PATH = value;
+    delete env.path;
   }
 
+  env.PATH = value;
+
   return env;
 }
 
 function setPath(env, newPath) {
   let result;
 
   if (_.isArray(newPath)) {
-    if (process.platform === 'win32') {
-      result = newPath.join(';');
-    } else {
-      result = newPath.join(':');
-    }
+    result = joinList(newPath);
 
     env = setExistingPath(env, result);
     local.set('environmentVariables', env);

src/browser/services/env.js

@@ -71,6 +71,30 @@ function createObjectEmitter(stream) {
   return emitter;
 }
 
+function isMissingRodeoDependency(client, data) {
+  const match = data.match(/Exception: (.+) is not installed/);
+
+  if (match && match[1]) {
+    const error = new Error(match[1] + ' is not installed');
+
+    error.missingPackage = match[1];
+
+    client.emit('error', error);
+  }
+}
+
+function isMissingImport(client, data) {
+  const match = data.match(/ImportError: No module named '(.+)'/);
+
+  if (match && match[1]) {
+    const error = new Error(match[1] + ' is not installed');
+
+    error.missingPackage = match[1];
+
+    client.emit('error', error);
+  }
+}
+
 /**
  * @param {JupyterClient} client
  * @param {string} source
@@ -79,15 +103,8 @@ function createObjectEmitter(stream) {
 function handleProcessStreamEvent(client, source, data) {
   if (source === 'stderr.data') {
     data = data.toString();
-    const match = data.match(/Exception: (.+) is not installed/);
-
-    if (match && match[1]) {
-      const error = new Error(match[1] + ' is not installed');
-
-      error.missingPackage = match[1];
-
-      client.emit('error', error);
-    }
+    isMissingRodeoDependency(client, data);
+    isMissingImport(client, data);
   }
 
   client.emit('event', source, data);