pinokiod 1.1.13 → 1.1.15
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 +17 -1
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -469,6 +469,9 @@ class Shell {
|
|
|
469
469
|
// using the base env
|
|
470
470
|
params.message = [
|
|
471
471
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
472
|
+
`conda deactivate`,
|
|
473
|
+
`conda deactivate`,
|
|
474
|
+
`conda deactivate`,
|
|
472
475
|
`conda activate ${params.conda}`,
|
|
473
476
|
].concat(params.message)
|
|
474
477
|
} else {
|
|
@@ -479,6 +482,9 @@ class Shell {
|
|
|
479
482
|
params.message = [
|
|
480
483
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
481
484
|
//`conda activate ${params.conda}`,
|
|
485
|
+
`conda deactivate`,
|
|
486
|
+
`conda deactivate`,
|
|
487
|
+
`conda deactivate`,
|
|
482
488
|
`conda activate ${env_path}`,
|
|
483
489
|
].concat(params.message)
|
|
484
490
|
} else {
|
|
@@ -486,6 +492,9 @@ class Shell {
|
|
|
486
492
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
487
493
|
`conda create -y -p ${env_path} python=3.10`,
|
|
488
494
|
//`conda activate ${params.conda}`,
|
|
495
|
+
`conda deactivate`,
|
|
496
|
+
`conda deactivate`,
|
|
497
|
+
`conda deactivate`,
|
|
489
498
|
`conda activate ${env_path}`,
|
|
490
499
|
].concat(params.message)
|
|
491
500
|
}
|
|
@@ -495,6 +504,9 @@ class Shell {
|
|
|
495
504
|
if (env_exists) {
|
|
496
505
|
params.message = [
|
|
497
506
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
507
|
+
`conda deactivate`,
|
|
508
|
+
`conda deactivate`,
|
|
509
|
+
`conda deactivate`,
|
|
498
510
|
`conda activate ${env_path}`,
|
|
499
511
|
].concat(params.message)
|
|
500
512
|
} else {
|
|
@@ -507,6 +519,9 @@ class Shell {
|
|
|
507
519
|
params.message = [
|
|
508
520
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
509
521
|
create_command,
|
|
522
|
+
`conda deactivate`,
|
|
523
|
+
`conda deactivate`,
|
|
524
|
+
`conda deactivate`,
|
|
510
525
|
`conda activate ${env_path}`,
|
|
511
526
|
].concat(params.message)
|
|
512
527
|
}
|
|
@@ -515,8 +530,9 @@ class Shell {
|
|
|
515
530
|
if (params.env) {
|
|
516
531
|
params.env.CONDA_PIP_INTEROP_ENABLED = "1"
|
|
517
532
|
params.env.CONDA_AUTO_ACTIVATE_BASE = "false"
|
|
533
|
+
params.env.PYTHONNOUSERSITE = "1"
|
|
518
534
|
} else {
|
|
519
|
-
params.env = { CONDA_PIP_INTEROP_ENABLED: "1", CONDA_AUTO_ACTIVATE_BASE: "false" }
|
|
535
|
+
params.env = { CONDA_PIP_INTEROP_ENABLED: "1", CONDA_AUTO_ACTIVATE_BASE: "false", PYTHONNOUSERSITE: "1" }
|
|
520
536
|
}
|
|
521
537
|
} else if (params.venv) {
|
|
522
538
|
let env_path = path.resolve(params.path, params.venv)
|