pinokiod 3.5.17 → 3.5.18
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 +21 -21
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -596,10 +596,10 @@ class Shell {
|
|
|
596
596
|
if (env_exists) {
|
|
597
597
|
conda_activation = [
|
|
598
598
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
599
|
-
`conda deactivate`,
|
|
600
|
-
`conda deactivate`,
|
|
601
|
-
`conda deactivate`,
|
|
602
|
-
timeout,
|
|
599
|
+
// `conda deactivate`,
|
|
600
|
+
// `conda deactivate`,
|
|
601
|
+
// `conda deactivate`,
|
|
602
|
+
// timeout,
|
|
603
603
|
`conda activate ${env_path}`,
|
|
604
604
|
timeout,
|
|
605
605
|
]
|
|
@@ -607,10 +607,10 @@ class Shell {
|
|
|
607
607
|
conda_activation = [
|
|
608
608
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
609
609
|
`conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
610
|
-
`conda deactivate`,
|
|
611
|
-
`conda deactivate`,
|
|
612
|
-
`conda deactivate`,
|
|
613
|
-
timeout,
|
|
610
|
+
// `conda deactivate`,
|
|
611
|
+
// `conda deactivate`,
|
|
612
|
+
// `conda deactivate`,
|
|
613
|
+
// timeout,
|
|
614
614
|
`conda activate ${env_path}`,
|
|
615
615
|
timeout,
|
|
616
616
|
]
|
|
@@ -619,10 +619,10 @@ class Shell {
|
|
|
619
619
|
if (conda_name === "base") {
|
|
620
620
|
conda_activation = [
|
|
621
621
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
622
|
-
`conda deactivate`,
|
|
623
|
-
`conda deactivate`,
|
|
624
|
-
`conda deactivate`,
|
|
625
|
-
timeout,
|
|
622
|
+
// `conda deactivate`,
|
|
623
|
+
// `conda deactivate`,
|
|
624
|
+
// `conda deactivate`,
|
|
625
|
+
// timeout,
|
|
626
626
|
`conda activate ${conda_name}`,
|
|
627
627
|
timeout,
|
|
628
628
|
]
|
|
@@ -633,21 +633,21 @@ class Shell {
|
|
|
633
633
|
if (env_exists) {
|
|
634
634
|
conda_activation = [
|
|
635
635
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
636
|
-
`conda deactivate`,
|
|
637
|
-
`conda deactivate`,
|
|
638
|
-
`conda deactivate`,
|
|
639
|
-
timeout,
|
|
636
|
+
// `conda deactivate`,
|
|
637
|
+
// `conda deactivate`,
|
|
638
|
+
// `conda deactivate`,
|
|
639
|
+
// timeout,
|
|
640
640
|
`conda activate ${conda_name}`,
|
|
641
641
|
timeout,
|
|
642
642
|
]
|
|
643
643
|
} else {
|
|
644
644
|
conda_activation = [
|
|
645
645
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
646
|
-
`conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
647
|
-
`conda deactivate`,
|
|
648
|
-
`conda deactivate`,
|
|
649
|
-
`conda deactivate`,
|
|
650
|
-
timeout,
|
|
646
|
+
// `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
647
|
+
// `conda deactivate`,
|
|
648
|
+
// `conda deactivate`,
|
|
649
|
+
// `conda deactivate`,
|
|
650
|
+
// timeout,
|
|
651
651
|
`conda activate ${conda_name}`,
|
|
652
652
|
timeout,
|
|
653
653
|
]
|