pinokiod 7.5.31 → 7.5.32

package/kernel/bin/conda-pins.js

@@ -1,6 +1,6 @@
 const semver = require('semver')
 
-const CONDA_PIN_VERSION = "26.3.2"
+const CONDA_PIN_VERSION = "26.5.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`

package/kernel/bin/conda.js

@@ -205,7 +205,8 @@ report_errors: false`)
           conda_versions[name] = version
           conda_builds[name] = build
           if (name === "conda") {
-            conda_check.conda = true
+            const coerced = semver.coerce(version)
+            conda_check.conda = coerced && semver.eq(coerced, CONDA_PIN_VERSION)
           }
           // check conda-libmamba-solver is up to date
           // sometimes it just fails silently so need to check
@@ -308,6 +309,7 @@ report_errors: false`)
 
     let condaPackages = [
       this.kernel.platform === "win32" ? `"${WINDOWS_PYTHON_SSL_FIX_SPEC}"` : `"${PYTHON_INSTALL_SPEC}"`,
+      `"conda=${CONDA_PIN_VERSION}"`,
       `"conda-libmamba-solver>=25.4.0"`,
     ]
 

package/package.json

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

package/test/conda-bin.test.js

@@ -7,6 +7,7 @@ const test = require('node:test')
 
 const Conda = require('../kernel/bin/conda')
 const {
+  CONDA_PIN_VERSION,
   PYTHON_INSTALL_SPEC,
   WINDOWS_PYTHON_SSL_FIX_SPEC,
   isExpectedPythonPinned,
@@ -42,7 +43,7 @@ async function writeCondaMeta(root, name, version, build = 'py_0') {
 }
 
 async function writeHealthyCondaMeta(root, platform = 'win32') {
-  await writeCondaMeta(root, 'conda', '26.3.2', 'py310')
+  await writeCondaMeta(root, 'conda', CONDA_PIN_VERSION, 'py310')
   await writeCondaMeta(root, 'conda-libmamba-solver', '25.4.0', 'pyhd3eb1b0_0')
   await writeCondaMeta(root, 'python', '3.10.20', platform === 'win32' ? 'h4de0772_1_cpython' : 'cpython')
 }
@@ -204,6 +205,7 @@ test('Conda init patches Windows OpenSSL hooks for legacy Miniconda roots', asyn
 })
 
 test('Conda pins Python 3.10.20 consistently across platforms', async () => {
+  assert.equal(CONDA_PIN_VERSION, '26.5.2')
   assert.equal(PYTHON_INSTALL_SPEC, 'python=3.10.20')
   assert.equal(WINDOWS_PYTHON_SSL_FIX_SPEC, 'python=3.10.20=*_1_cpython')
 
@@ -237,7 +239,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" "conda-libmamba-solver>=25.4.0"'
+    'conda install -y --override-channels -c conda-forge "python=3.10.20" "conda=26.5.2" "conda-libmamba-solver>=25.4.0"'
   )
 })
 
@@ -265,7 +267,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" "conda-libmamba-solver>=25.4.0"'
+    'conda install -y --override-channels -c conda-forge "python=3.10.20=*_1_cpython" "conda=26.5.2" "conda-libmamba-solver>=25.4.0"'
   )
 })
 
@@ -339,6 +341,16 @@ test('Conda check accepts a runnable managed Windows conda executable', async ()
   assert.equal(await createConda(createKernel(root, 'win32')).check(), true)
 })
 
+test('Conda check rejects runnable installs with the wrong Conda version', async () => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-smoke-wrong-version-'))
+  await writeCondaMeta(root, 'conda', '26.3.2', 'py310')
+  await writeCondaMeta(root, 'conda-libmamba-solver', '25.4.0', 'pyhd3eb1b0_0')
+  await writeCondaMeta(root, 'python', '3.10.20', 'h4de0772_1_cpython')
+  await writeFakeManagedConda(root, 'win32')
+
+  assert.equal(await createConda(createKernel(root, 'win32')).check(), false)
+})
+
 test('Conda install keeps the old runtime when the replacement installer download fails', async () => {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-download-fails-'))
   const miniconda = await createLegacyMiniconda(root)