pinokiod 3.2.111 → 3.2.113

package/kernel/bin/conda.js

@@ -12,7 +12,8 @@ class Conda {
     },
     win32: {
       //x64: "https://github.com/cocktailpeanut/miniconda/releases/download/v23.5.2/Miniconda3-py310_23.5.2-0-Windows-x86_64.exe",
-      x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Windows-x86_64.exe"
+      //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Windows-x86_64.exe"
+      x64: "https://repo.anaconda.com/miniconda/Miniconda3-py311_24.11.1-0-Windows-x86_64.exe"
     },
     linux: {
       //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_23.5.2-0-Linux-x86_64.sh",
@@ -64,8 +65,8 @@ create_default_packages:
       }
       let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
       if (pinned_exists) {
-        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.3
-conda-libmamba-solver=24.11.1`)
+        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`
+//conda-libmamba-solver=24.11.1`)
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
 //conda-libmamba-solver=24.11.1`)
@@ -112,8 +113,8 @@ conda-libmamba-solver=24.11.1`)
     // set pinned
     let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
     if (pinned_exists) {
-      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.3
-conda-libmamba-solver=24.11.1`)
+      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
+//conda-libmamba-solver=24.11.1`)
 //      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
 //      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
 //conda-libmamba-solver=24.11.1`)
@@ -137,13 +138,11 @@ conda-libmamba-solver=24.11.1`)
 //      "conda install libsqlite --force-reinstall -y",
 //      `conda config --file ${this.kernel.path('condarc')} --set auto_update_conda False`,
       //"conda install -y conda=24.9.0 -vvv --strict-channel-priority",
-      "conda install -y conda=24.11.3 conda-libmamba-solver=24.11.1 -vvv",
+      //"conda install -y conda=24.11.3 conda-libmamba-solver=24.11.1 -vvv",
       //"conda install -y conda-libmamba-solver=24.7.0 conda=24.7.1 -vvv --strict-channel-priority",
       //"conda install -y conda-libmamba-solver=24.11.1 conda=24.7.1",
       //"conda install -y conda-libmamba-solver=24.11.1 conda=24.11.2",
-      "conda clean -y --all",
-      "conda update -y --all -vvv",
-      "conda clean -y --all",
+      "conda update -y --all",
 //      "conda update -y conda",
 //      "conda update -y --all",
     ]

package/kernel/bin/index.js

@@ -268,19 +268,20 @@ class Bin {
             let version = chunks[1]
             conda.add(name)
             if (name === "conda") {
-              if (String(version) === "24.11.3") {
+              if (String(version) === "24.11.1") {
+              //if (String(version) === "24.11.3") {
               //if (String(version) === "24.9.0") {
               //if (String(version) === "24.7.1") {
               //if (String(version) === "24.11.2") {
                 conda_check.conda = true
               }
             }
-            if (name === "conda-libmamba-solver") {
-              //if (String(version) === "24.7.0") {
-              if (String(version) === "24.11.1") {
-                conda_check.mamba = true
-              }
-            }
+//            if (name === "conda-libmamba-solver") {
+//              //if (String(version) === "24.7.0") {
+//              if (String(version) === "24.11.1") {
+//                conda_check.mamba = true
+//              }
+//            }
           }
         } else {
           if (/name.*version.*build.*channel/i.test(line)) {
@@ -291,7 +292,8 @@ class Bin {
     }
 
     console.log({ conda_check })
-    if (conda_check.conda && conda_check.mamba) {
+    //if (conda_check.conda && conda_check.mamba) {
+    if (conda_check.conda) {
       this.correct_conda = true
     }
 

package/kernel/bin/py.js

@@ -1,5 +1,6 @@
 class Py {
   async install(req, ondata) {
+    await fs.promises.rm(this.kernel.path("bin/py")).catch((e) => { console.log(e) })
     await this.kernel.exec({
       message: "git clone https://github.com/pinokiocomputer/python py",
       path: this.kernel.path("bin")

package/kernel/bin/uv.js

@@ -5,7 +5,7 @@ const decompress = require('decompress');
 class UV {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install -y -c conda-forge uv --strict-channel-priority -vvv",
+      message: "conda install -y -c conda-forge uv",
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.111",
+  "version": "3.2.113",
   "description": "",
   "main": "index.js",
   "scripts": {