pinokiod 3.6.17 → 3.6.19

package/kernel/bin/conda.js

@@ -80,8 +80,7 @@ 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
-sqlite ==3.48.0`)
+        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.9.0`)
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
 //conda-libmamba-solver=24.11.1`)
@@ -138,16 +137,16 @@ sqlite ==3.48.0`)
 
           // 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)) {
@@ -157,7 +156,8 @@ sqlite ==3.48.0`)
     }
     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
   }
   async install(req, ondata) {
     for(let i=0; i<5; i++) {
@@ -206,8 +206,7 @@ sqlite ==3.48.0`)
     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.1`)
-      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3
-sqlite ==3.48.0`)
+      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.9.0`)
 //      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
 //conda-libmamba-solver=24.11.1`)
@@ -250,7 +249,6 @@ sqlite ==3.48.0`)
       //"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 install -y sqlite=3.48.0 -c conda-forge",
       "conda update -y conda",// -vvv --debug",
       "conda update -y --all",// -vvv --debug",
 //      "python -m pip install --upgrade pip setuptools wheel",

package/kernel/bin/ffmpeg.js

@@ -7,7 +7,8 @@ class Ffmpeg {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        "conda install -y -c conda-forge ffmpeg=5.1.2",
+        //"conda install -y -c conda-forge ffmpeg=5.1.2",
+        "conda install -y -c conda-forge ffmpeg sqlite==3.48.0",
       ]
 //      conda: {
 //        name: "base",
@@ -16,7 +17,8 @@ class Ffmpeg {
     }, ondata)
   }
   async installed() {
-    return this.kernel.bin.installed.conda.has("ffmpeg") && this.kernel.bin.installed.conda_versions.ffmpeg === "5.1.2"
+    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.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")
+//              }
+//            }
           }
         } else {
           if (/.*name.*version.*build.*channel/i.test(line)) {
@@ -328,7 +328,8 @@ class Bin {
       }
 
       console.log({ conda_check })
-      if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+      //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.17",
+  "version": "3.6.19",
   "description": "",
   "main": "index.js",
   "scripts": {