pinokiod 3.6.37 → 3.6.39

package/kernel/bin/conda.js

@@ -80,7 +80,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'), `conda ==24.11.3`)
+        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
@@ -119,10 +120,11 @@ report_errors: false`)
           let version = chunks[1]
           conda.add(name)
           if (name === "conda") {
-            //if (String(version) === "24.11.1") {
-            if (String(version) === "24.11.3") {
-              conda_check.conda = true
-            }
+            conda_check.conda = true
+//            //if (String(version) === "24.11.1") {
+//            if (String(version) === "24.11.3") {
+//              conda_check.conda = true
+//            }
           }
           // check conda-libmamba-solver is up to date
           // sometimes it just fails silently so need to check
@@ -138,17 +140,17 @@ 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)) {
@@ -158,7 +160,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 && conda_check.sqlite
+    return conda_check.conda && conda_check.mamba
   }
   async install(req, ondata) {
     for(let i=0; i<5; i++) {
@@ -207,7 +210,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.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`)
+      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

package/kernel/bin/index.js

@@ -335,10 +335,11 @@ class Bin {
             conda.add(name)
             conda_versions[name] = version
             if (name === "conda") {
-              //if (String(version) === "24.11.1") {
-              if (String(version) === "24.11.3") {
-                conda_check.conda = true
-              }
+              conda_check.conda = true
+//              //if (String(version) === "24.11.1") {
+//              if (String(version) === "24.11.3") {
+//                conda_check.conda = true
+//              }
             }
             if (name === "conda-libmamba-solver") {
               //if (String(version) === "24.7.0") {
@@ -352,18 +353,18 @@ 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.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")
-              }
-            }
+//            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)) {
@@ -373,7 +374,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.37",
+  "version": "3.6.39",
   "description": "",
   "main": "index.js",
   "scripts": {