pinokiod 3.6.19 → 3.6.21

package/kernel/bin/conda.js

@@ -79,14 +79,15 @@ report_errors: false`)
 //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`)
+      if (pinned_exists) {
+        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3
+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
 //conda-libmamba-solver=24.11.1`)
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.7.1
 //conda-libmamba-solver=24.7.0`)
-//      }
+      }
     }
   }
 //  async init() {
@@ -137,16 +138,16 @@ 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") {
+            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)) {
@@ -156,8 +157,7 @@ report_errors: false`)
     }
     console.log("> Check", { conda_check, conda })
     this.kernel.bin.installed.conda = conda
-    return conda_check.conda && conda_check.mamba
-    //return conda_check.conda && conda_check.mamba && conda_check.sqlite
+    return conda_check.conda && conda_check.mamba && conda_check.sqlite
   }
   async install(req, ondata) {
     for(let i=0; i<5; i++) {
@@ -204,15 +204,16 @@ report_errors: false`)
 
     // set pinned
     let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
-//    if (pinned_exists) {
+    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'), `conda ==24.11.3
+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
 //conda-libmamba-solver=24.11.1`)
 //      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.7.1
 //conda-libmamba-solver=24.7.0`)
-//    }
+    }
 ////    await this.activate()
 //    await fs.promises.writeFile(this.kernel.bin.path('miniconda/condarc'), `channels:
 //  - conda-forge
@@ -249,7 +250,7 @@ report_errors: false`)
       //"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 update -y conda-libmamba-solver",
-      "conda update -y conda",// -vvv --debug",
+      "conda update -y conda sqlite",// -vvv --debug",
       "conda update -y --all",// -vvv --debug",
 //      "python -m pip install --upgrade pip setuptools wheel",
 //      "python -m ensurepip --upgrade",

package/kernel/bin/ffmpeg.js

@@ -17,8 +17,8 @@ class Ffmpeg {
     }, ondata)
   }
   async installed() {
-    return this.kernel.bin.installed.conda.has("ffmpeg") && this.kernel.bin.installed.conda_versions.sqlite === "3.48.0"
-    //return this.kernel.bin.installed.conda.has("ffmpeg")
+    //return this.kernel.bin.installed.conda.has("ffmpeg") && this.kernel.bin.installed.conda_versions.sqlite === "3.48.0"
+    return this.kernel.bin.installed.conda.has("ffmpeg")
   }
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({

package/kernel/bin/index.js

@@ -308,17 +308,17 @@ 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") {
-//              let coerced = semver.coerce(version)
-//              let sqlite_requirement = "==3.48.0"
-//  //            console.log({ coerced, version, sqlite_requirement })
-//              if (semver.satisfies(coerced, sqlite_requirement)) {
-//                console.log("semver satisfied")
-//                conda_check.sqlite = true
-//              } else {
-//                console.log("semver NOT satisfied")
-//              }
-//            }
+            if (name === "sqlite") {
+              let coerced = semver.coerce(version)
+              let sqlite_requirement = ">=3.47.2"
+  //            console.log({ coerced, version, sqlite_requirement })
+              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)) {
@@ -328,8 +328,7 @@ 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) {
         this.correct_conda = true
       }
     }

package/package.json

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