pinokiod 3.5.18 → 3.5.19
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 +27 -27
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -596,35 +596,35 @@ class Shell {
|
|
|
596
596
|
if (env_exists) {
|
|
597
597
|
conda_activation = [
|
|
598
598
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
599
|
+
`conda deactivate`,
|
|
600
|
+
`conda deactivate`,
|
|
601
|
+
`conda deactivate`,
|
|
602
602
|
// timeout,
|
|
603
603
|
`conda activate ${env_path}`,
|
|
604
|
-
timeout,
|
|
604
|
+
// timeout,
|
|
605
605
|
]
|
|
606
606
|
} else {
|
|
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
|
-
|
|
611
|
-
|
|
612
|
-
|
|
610
|
+
`conda deactivate`,
|
|
611
|
+
`conda deactivate`,
|
|
612
|
+
`conda deactivate`,
|
|
613
613
|
// timeout,
|
|
614
614
|
`conda activate ${env_path}`,
|
|
615
|
-
timeout,
|
|
615
|
+
// timeout,
|
|
616
616
|
]
|
|
617
617
|
}
|
|
618
618
|
} else if (conda_name) {
|
|
619
619
|
if (conda_name === "base") {
|
|
620
620
|
conda_activation = [
|
|
621
621
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
622
|
+
`conda deactivate`,
|
|
623
|
+
`conda deactivate`,
|
|
624
|
+
`conda deactivate`,
|
|
625
625
|
// timeout,
|
|
626
626
|
`conda activate ${conda_name}`,
|
|
627
|
-
timeout,
|
|
627
|
+
// timeout,
|
|
628
628
|
]
|
|
629
629
|
} else {
|
|
630
630
|
let envs_path = this.kernel.bin.path("miniconda/envs")
|
|
@@ -633,23 +633,23 @@ class Shell {
|
|
|
633
633
|
if (env_exists) {
|
|
634
634
|
conda_activation = [
|
|
635
635
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
636
|
+
`conda deactivate`,
|
|
637
|
+
`conda deactivate`,
|
|
638
|
+
`conda deactivate`,
|
|
639
639
|
// timeout,
|
|
640
640
|
`conda activate ${conda_name}`,
|
|
641
|
-
timeout,
|
|
641
|
+
// timeout,
|
|
642
642
|
]
|
|
643
643
|
} else {
|
|
644
644
|
conda_activation = [
|
|
645
645
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
646
|
+
`conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
647
|
+
`conda deactivate`,
|
|
648
|
+
`conda deactivate`,
|
|
649
|
+
`conda deactivate`,
|
|
650
650
|
// timeout,
|
|
651
651
|
`conda activate ${conda_name}`,
|
|
652
|
-
timeout,
|
|
652
|
+
// timeout,
|
|
653
653
|
]
|
|
654
654
|
}
|
|
655
655
|
}
|
|
@@ -793,13 +793,13 @@ class Shell {
|
|
|
793
793
|
// `python -m venv --upgrade ${env_path}`,
|
|
794
794
|
// `uv venv --allow-existing ${env_path}${python_version}`,
|
|
795
795
|
(this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
|
|
796
|
-
timeout,
|
|
796
|
+
// timeout,
|
|
797
797
|
]
|
|
798
798
|
} else {
|
|
799
799
|
venv_activation = [
|
|
800
800
|
// `python -m venv --upgrade ${env_path}`,
|
|
801
801
|
(this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
|
|
802
|
-
timeout,
|
|
802
|
+
// timeout,
|
|
803
803
|
]
|
|
804
804
|
}
|
|
805
805
|
} else {
|
|
@@ -810,9 +810,9 @@ class Shell {
|
|
|
810
810
|
(this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
|
|
811
811
|
`uv pip install --upgrade pip setuptools wheel`,
|
|
812
812
|
deactivate_path,
|
|
813
|
-
timeout,
|
|
813
|
+
// timeout,
|
|
814
814
|
(this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
|
|
815
|
-
timeout,
|
|
815
|
+
// timeout,
|
|
816
816
|
]
|
|
817
817
|
} else {
|
|
818
818
|
// when python version is not specified, use the default python -m venv
|
|
@@ -821,9 +821,9 @@ class Shell {
|
|
|
821
821
|
(this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
|
|
822
822
|
`python -m pip install --upgrade pip setuptools wheel`,
|
|
823
823
|
deactivate_path,
|
|
824
|
-
timeout,
|
|
824
|
+
// timeout,
|
|
825
825
|
(this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
|
|
826
|
-
timeout,
|
|
826
|
+
// timeout,
|
|
827
827
|
]
|
|
828
828
|
}
|
|
829
829
|
}
|