pinokiod 7.5.4 → 7.5.6

package/kernel/bin/conda-pins.js

@@ -1,28 +1,10 @@
 const semver = require('semver')
 
 const CONDA_PIN_VERSION = "26.3.2"
-const DEFAULT_SQLITE_PIN_VERSION = "3.47.2"
-const WINDOWS_SQLITE_PIN_VERSION = "3.53.2"
 const PYTHON_PIN_VERSION = "3.10.20"
 const PYTHON_INSTALL_SPEC = `python=${PYTHON_PIN_VERSION}`
 const WINDOWS_PYTHON_SSL_FIX_SPEC = `${PYTHON_INSTALL_SPEC}=*_1_cpython`
 
-const sqlitePinVersion = (platform) => {
-  return platform === "win32" ? WINDOWS_SQLITE_PIN_VERSION : DEFAULT_SQLITE_PIN_VERSION
-}
-
-const sqliteInstallSpec = (platform) => {
-  return `sqlite=${sqlitePinVersion(platform)}`
-}
-
-const sqlitePinnedSpec = (platform) => {
-  return `sqlite ==${sqlitePinVersion(platform)}`
-}
-
-const isExpectedSqlitePinned = (platform, version) => {
-  return String(version) === sqlitePinVersion(platform)
-}
-
 const condaBuildNumber = (build) => {
   const chunks = String(build || "").split("_").reverse()
   const buildNumber = chunks.find((chunk) => /^\d+$/.test(chunk))
@@ -48,8 +30,5 @@ module.exports = {
   CONDA_PIN_VERSION,
   PYTHON_INSTALL_SPEC,
   WINDOWS_PYTHON_SSL_FIX_SPEC,
-  isExpectedSqlitePinned,
   isExpectedPythonPinned,
-  sqliteInstallSpec,
-  sqlitePinnedSpec,
 }

package/kernel/bin/conda.js

@@ -8,9 +8,6 @@ const {
   PYTHON_INSTALL_SPEC,
   WINDOWS_PYTHON_SSL_FIX_SPEC,
   isExpectedPythonPinned,
-  isExpectedSqlitePinned,
-  sqliteInstallSpec,
-  sqlitePinnedSpec,
 } = require('./conda-pins')
 
 const MINIFORGE_RELEASE = "26.3.2-3"
@@ -46,7 +43,6 @@ class Conda {
   pinnedPackages() {
     return [
       `conda ==${CONDA_PIN_VERSION}`,
-      sqlitePinnedSpec(this.kernel.platform),
     ].join("\n")
   }
   async hasCondaMeta() {
@@ -161,22 +157,6 @@ 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") {
-            if (isExpectedSqlitePinned(this.kernel.platform, version)) {
-              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")
-            //}
-          }
           if (name === "python") {
             conda_check.python = isExpectedPythonPinned(this.kernel.platform, version, build)
           }
@@ -190,7 +170,7 @@ report_errors: false`)
     this.kernel.bin.installed.conda = conda
     this.kernel.bin.installed.conda_versions = conda_versions
     this.kernel.bin.installed.conda_builds = conda_builds
-    return conda_check.conda && conda_check.mamba && conda_check.sqlite && conda_check.python
+    return conda_check.conda && conda_check.mamba && conda_check.python
   }
   async install(req, ondata) {
     for(let i=0; i<5; i++) {
@@ -265,7 +245,6 @@ report_errors: false`)
 
     let condaPackages = [
       this.kernel.platform === "win32" ? `"${WINDOWS_PYTHON_SSL_FIX_SPEC}"` : `"${PYTHON_INSTALL_SPEC}"`,
-      `"${sqliteInstallSpec(this.kernel.platform)}"`,
       `"conda-libmamba-solver>=25.4.0"`,
     ]
 

package/kernel/bin/git.js

@@ -7,7 +7,7 @@ const path = require("path")
 class Git {
   description = "Installs Git, Git LFS, Git Credential Manager, and GitHub CLI in the Pinokio environment."
   cmd() {
-    const packages = "git=2.51.0 git-lfs git-credential-manager=2.7.3 gh=2.82.1"
+    const packages = '"git>=2.51.0" git-lfs git-credential-manager=2.7.3 gh=2.82.1'
     if (this.kernel.platform === "darwin") {
       return packages
     } else if (this.kernel.platform === "win32") {

package/kernel/bin/index.js

@@ -24,7 +24,6 @@ const Torch = require("./torch")
 const { buildCondaListFromMeta } = require('./conda-meta')
 const {
   isExpectedPythonPinned,
-  isExpectedSqlitePinned,
 } = require('./conda-pins')
 const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
@@ -406,13 +405,6 @@ class Bin {
                 conda_check.mamba = true
               }
             }
-            // 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 (isExpectedSqlitePinned(this.platform, version)) {
-                conda_check.sqlite = true
-              }
-            }
             if (name === "python") {
               conda_check.python = isExpectedPythonPinned(this.platform, version, build)
             }
@@ -424,7 +416,7 @@ class Bin {
         }
       }
 
-      if (conda_check.conda && conda_check.mamba && conda_check.sqlite && conda_check.python) {
+      if (conda_check.conda && conda_check.mamba && conda_check.python) {
         this.correct_conda = true
       }
     }
@@ -452,8 +444,6 @@ class Bin {
     let res
     let lines
     this.installed.conda = new Set()
-    this.installed.conda_versions = {}
-    this.installed.conda_builds = {}
     if (conda_exists) {
       // Try 3 times, because sometimes conda just silently quits with no error message
       for(let i=0; i<5; i++) {

package/package.json

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

package/server/index.js

@@ -5990,13 +5990,13 @@ class Server {
     if (home) {
       if (version === this.version.pinokiod) {
         console.log("version up to date")
-      } else if (!(await this.kernel.exists("bin/miniforge/conda-meta"))) {
+      } else if (!(await fse.pathExists(path.resolve(home, "bin/miniforge/conda-meta")))) {
         console.warn("[WARN] Managed home refresh deferred until Miniforge is installed")
       } else {
         // For every update, this gets triggered exactly once.
         // 1. first mkdir if it doesn't exist (this step is irrelevant since at this point the home dir will exist)
         
-        let exists = await this.kernel.exists(home)
+        let exists = await fse.pathExists(home)
         if (!exists) {
           await fs.promises.mkdir(home, { recursive: true })
         }
@@ -6004,7 +6004,7 @@ class Server {
         needsManagedRefresh = true
         console.log("[TRY] Updating to the new version")
         let envPath = path.resolve(home, "ENVIRONMENT")
-        let envExists = await this.kernel.exists(envPath)
+        let envExists = await fse.pathExists(envPath)
         if (!envExists) {
           let str = await Environment.ENV("system", home, this.kernel)
           await fs.promises.writeFile(envPath, str)

package/test/conda-bin.test.js

@@ -120,7 +120,7 @@ test('Conda install requests the Python 3.10.20 pin on macOS/Linux', async () =>
   assert.ok(condaInstall)
   assert.equal(
     condaInstall.message[1],
-    'conda install -y --override-channels -c conda-forge "python=3.10.20" "sqlite=3.47.2" "conda-libmamba-solver>=25.4.0"'
+    'conda install -y --override-channels -c conda-forge "python=3.10.20" "conda-libmamba-solver>=25.4.0"'
   )
 })
 
@@ -148,7 +148,7 @@ test('Conda install keeps the Windows Python 3.10.20 SSL-fixed build pin', async
   assert.ok(condaInstall)
   assert.equal(
     condaInstall.message[1],
-    'conda install -y --override-channels -c conda-forge "python=3.10.20=*_1_cpython" "sqlite=3.53.2" "conda-libmamba-solver>=25.4.0"'
+    'conda install -y --override-channels -c conda-forge "python=3.10.20=*_1_cpython" "conda-libmamba-solver>=25.4.0"'
   )
 })
 

package/test/git-bin.test.js

@@ -23,15 +23,15 @@ function createGitBin(platform, packages) {
 test('Git bin installs Git Credential Manager with the Git bundle', () => {
   assert.equal(
     createGitBin('darwin', []).cmd(),
-    'git=2.51.0 git-lfs git-credential-manager=2.7.3 gh=2.82.1'
+    '"git>=2.51.0" git-lfs git-credential-manager=2.7.3 gh=2.82.1'
   )
   assert.equal(
     createGitBin('linux', []).cmd(),
-    'git=2.51.0 git-lfs git-credential-manager=2.7.3 gh=2.82.1'
+    '"git>=2.51.0" git-lfs git-credential-manager=2.7.3 gh=2.82.1'
   )
   assert.equal(
     createGitBin('win32', []).cmd(),
-    'git=2.51.0 git-lfs git-credential-manager=2.7.3 gh=2.82.1 m2-base'
+    '"git>=2.51.0" git-lfs git-credential-manager=2.7.3 gh=2.82.1 m2-base'
   )
 })