pinokiod 1.1.15 → 1.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/shell.js +8 -5
- package/kernel/shells.js +2 -0
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -464,6 +464,7 @@ class Shell {
|
|
|
464
464
|
}
|
|
465
465
|
}
|
|
466
466
|
async activate(params) {
|
|
467
|
+
console.log("activate", params)
|
|
467
468
|
if (params.conda) {
|
|
468
469
|
if (params.conda === "base") {
|
|
469
470
|
// using the base env
|
|
@@ -527,12 +528,13 @@ class Shell {
|
|
|
527
528
|
}
|
|
528
529
|
}
|
|
529
530
|
}
|
|
530
|
-
if (
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
531
|
+
if (this.env) {
|
|
532
|
+
// this.env.CONDA_PIP_INTEROP_ENABLED = "1"
|
|
533
|
+
this.env.CONDA_AUTO_ACTIVATE_BASE = "false"
|
|
534
|
+
this.env.PYTHONNOUSERSITE = "1"
|
|
534
535
|
} else {
|
|
535
|
-
|
|
536
|
+
//this.env = { CONDA_PIP_INTEROP_ENABLED: "1", CONDA_AUTO_ACTIVATE_BASE: "false", PYTHONNOUSERSITE: "1" }
|
|
537
|
+
this.env = { CONDA_AUTO_ACTIVATE_BASE: "false", PYTHONNOUSERSITE: "1" }
|
|
536
538
|
}
|
|
537
539
|
} else if (params.venv) {
|
|
538
540
|
let env_path = path.resolve(params.path, params.venv)
|
|
@@ -554,6 +556,7 @@ class Shell {
|
|
|
554
556
|
}
|
|
555
557
|
async exec(params) {
|
|
556
558
|
params = await this.activate(params)
|
|
559
|
+
console.log("** params", params)
|
|
557
560
|
|
|
558
561
|
this.cmd = this.build(params)
|
|
559
562
|
let res = await new Promise((resolve, reject) => {
|
package/kernel/shells.js
CHANGED
|
@@ -28,7 +28,9 @@ class Shells {
|
|
|
28
28
|
*/
|
|
29
29
|
async launch(params, options, ondata) {
|
|
30
30
|
// iterate through all the envs
|
|
31
|
+
console.log("before launch", params.env)
|
|
31
32
|
params.env = this.kernel.bin.envs(params.env)
|
|
33
|
+
console.log("after launch", params.env)
|
|
32
34
|
|
|
33
35
|
let exec_path = (params.path ? params.path : ".") // use the current path if not specified
|
|
34
36
|
let cwd = (options && options.cwd ? options.cwd : this.kernel.homedir) // if cwd exists, use it. Otherwise the cwd is pinokio home folder (~/pinokio)
|