pinokiod 3.6.40 → 3.6.41

package/kernel/bin/conda.js

@@ -90,7 +90,8 @@ report_errors: false`)
       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`)
-        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
+        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "sqlite ==3.47.2")
+//        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
 //sqlite ==3.47.2`)
 //        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
@@ -149,17 +150,20 @@ report_errors: false`)
 
           // Use sqlite to check if `conda update -y --all` went through successfully
           // sometimes it just fails silently so need to check
-//          if (name === "sqlite") {
-//            let coerced = semver.coerce(version)
-//            let sqlite_requirement = ">=3.47.2"
-//            if (semver.satisfies(coerced, sqlite_requirement)) {
-//              console.log("semver satisfied")
-//
-//              conda_check.sqlite = true
-//            } else {
-//              console.log("semver NOT satisfied")
-//            }
-//          }
+          if (name === "sqlite") {
+            if (String(version) === "3.47.2") {
+              conda_check.sqlite = true
+            }
+            //let coerced = semver.coerce(version)
+            //let sqlite_requirement = ">=3.47.2"
+            //if (semver.satisfies(coerced, sqlite_requirement)) {
+            //  console.log("semver satisfied")
+
+            //  conda_check.sqlite = true
+            //} else {
+            //  console.log("semver NOT satisfied")
+            //}
+          }
         }
       } else {
         if (/.*name.*version.*build.*channel/i.test(line)) {
@@ -169,8 +173,8 @@ report_errors: false`)
     }
     console.log("> Check", { conda_check, conda })
     this.kernel.bin.installed.conda = conda
-    //return conda_check.conda && conda_check.mamba && conda_check.sqlite
-    return conda_check.conda && conda_check.mamba
+    return conda_check.conda && conda_check.mamba && conda_check.sqlite
+    //return conda_check.conda && conda_check.mamba
   }
   async install(req, ondata) {
     for(let i=0; i<5; i++) {
@@ -220,7 +224,8 @@ report_errors: false`)
     if (pinned_exists) {
       //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
       //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3`)
-      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
+      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "sqlite ==3.47.2")
+      //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
 //sqlite ==3.47.2`)
 //      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
@@ -244,6 +249,7 @@ report_errors: false`)
     let cmds = [
       //"conda clean -y --index-cache",
       "conda clean -y --all",
+      "conda install -y -c conda-forge sqlite=3.47.2",
 
 //      `conda config --file ${this.kernel.path('condarc')} --set remote_connect_timeout_secs 20`,
 //      `conda config --file ${this.kernel.path('condarc')} --set remote_read_timeout_secs 300`,
@@ -265,8 +271,12 @@ report_errors: false`)
       //"conda install -y conda-libmamba-solver=24.11.1 conda=24.11.2",
       //"conda update -y conda-libmamba-solver",
       //"conda update -y conda sqlite",// -vvv --debug",
-      "conda update -y conda",// -vvv --debug",
-      "conda update -y --all",// -vvv --debug",
+
+
+//      "conda update -y conda",// -vvv --debug",
+//      "conda update -y --all",// -vvv --debug",
+
+
 //      "python -m pip install --upgrade pip setuptools wheel",
 //      "python -m ensurepip --upgrade",
 //      "conda update -y conda",

package/kernel/bin/index.js

@@ -353,7 +353,10 @@ class Bin {
             }
             // Use sqlite to check if `conda update -y --all` went through successfully
             // sometimes it just fails silently so need to check
-//            if (name === "sqlite") {
+            if (name === "sqlite") {
+              if (String(version) === "3.47.2") {
+                conda_check.sqlite = true
+              }
 //              let coerced = semver.coerce(version)
 //              let sqlite_requirement = ">=3.47.2"
 //  //            console.log({ coerced, version, sqlite_requirement })
@@ -363,8 +366,8 @@ class Bin {
 //                conda_check.sqlite = true
 //              } else {
 //                console.log("semver NOT satisfied")
-//              }
-//            }
+              }
+            }
           }
         } else {
           if (/.*name.*version.*build.*channel/i.test(line)) {
@@ -374,8 +377,8 @@ class Bin {
       }
 
       console.log({ conda_check })
-      //if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
-      if (conda_check.conda && conda_check.mamba) {
+      if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+      //if (conda_check.conda && conda_check.mamba) {
         this.correct_conda = true
       }
     }

package/package.json

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