pinokiod 8.2.6 → 8.2.7

package/kernel/shell.js

@@ -21,7 +21,7 @@ const ShellParser = require('./shell_parser')
 const AnsiStreamTracker = require('./ansi_stream_tracker')
 const ShellStateSync = require('./shell_state_sync')
 const ShellRunTemplate = require('./api/shell_run_template')
-const { PYTHON_INSTALL_SPEC } = require('./bin/conda-pins')
+const { PYTHON_INSTALL_SPEC, PIP_MIN_VERSION } = require('./bin/conda-pins')
 const CondaRuntimeGuard = require('./shell_conda_runtime_guard')
 const home = os.homedir()
 const WINDOWS_CMD_CONDA_COMMAND_PATTERN = /(?:^|[&|()]\s*)@?\s*(?:call\s+)?(?:"[^"]*[\\/]conda(?:\.bat|\.exe)?"|(?:[a-z]:)?[^&|()\s"]*[\\/]conda(?:\.bat|\.exe)?|conda(?:\.bat|\.exe)?)\s+/i
@@ -1391,9 +1391,9 @@ class Shell {
 //              timeout,
             ]
           } else {
-            // when python version is not specified, seed pip using the activated Python
+            // when python version is not specified, use the default python -m venv
             venv_activation = [
-              `uv venv --seed --python-preference only-system --python python ${shellEnvPath}`,
+              `python -m venv ${shellEnvPath}`,
               activate_command,
 //              `python -m pip install --upgrade pip setuptools wheel`,
               deactivate_path,
@@ -1403,6 +1403,10 @@ class Shell {
             ]
           }
         }
+        if (!use_uv) {
+          const updatePip = `uv pip install --exclude-newer-package pip=false "pip>=${PIP_MIN_VERSION}"`
+          venv_activation.push(this.isPowerShell() ? `${updatePip}; if ($LASTEXITCODE -ne 0) { exit 1 }` : `${updatePip} || exit 1`)
+        }
       } else {
         venv_activation = []
       }

package/package.json

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

package/test/shell-run-template.test.js

@@ -3,9 +3,11 @@ const fs = require('node:fs/promises')
 const os = require('node:os')
 const path = require('node:path')
 const test = require('node:test')
+const { spawnSync } = require('node:child_process')
 
 const ShellRunTemplate = require('../kernel/api/shell_run_template')
 const Shell = require('../kernel/shell')
+const { PIP_MIN_VERSION } = require('../kernel/bin/conda-pins')
 
 function createKernel(root = process.cwd()) {
   return {
@@ -379,14 +381,17 @@ test('redactEnvArgs summarizes protected argv env values', () => {
 })
 
 
-test('venv creation preserves interpreter selection and existing environments across shells', async t => {
+test('venvs preserve creation behavior and enforce the pip minimum across shells', async t => {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-venv-selection-'))
   t.after(() => fs.rm(root, { recursive: true, force: true }))
   const cases = [
-    { venv: 'default-env', seeded: true },
+    { venv: 'default-env' },
+    { venv: { path: 'object-default-env' } },
     { venv: 'explicit-env', venv_python: '3.10', version: '3.10' },
     { venv: { path: 'object-env', python: '3.11' }, version: '3.11' },
     { venv: 'existing-env', existing: true },
+    { venv: 'existing-env', venv_python: '3.10', version: '3.10', existing: true },
+    {},
   ]
   await fs.mkdir(path.join(root, 'existing-env'))
   for (const [platform, shellName] of [
@@ -408,17 +413,54 @@ test('venv creation preserves interpreter selection and existing environments ac
         message: 'echo PINOKIO_REQUIREMENTS_RAN',
       })
       const command = shell.build(params)
-      assert.doesNotMatch(command, /python -m venv|python -I|files\.pythonhosted\.org|\|\| exit 1/)
+      assert.doesNotMatch(command, /--seed|--no-config|--python-preference|python -I|files\.pythonhosted\.org/)
       assert.match(command, /echo PINOKIO_REQUIREMENTS_RAN$/)
-      if (scenario.existing) {
-        assert.doesNotMatch(command, /uv venv|--seed/)
-      } else if (scenario.seeded) {
-        assert.match(command, /uv venv --seed --python-preference only-system --python python /)
-      } else {
+      if (!scenario.venv || scenario.existing) {
+        assert.doesNotMatch(command, /python -m venv|uv venv/)
+      } else if (scenario.version) {
         assert.ok(command.includes(` --python ${scenario.version}`), command)
-        assert.doesNotMatch(command, /--seed|--python-preference only-system/)
+        assert.doesNotMatch(command, /python -m venv/)
+      } else {
+        assert.match(command, /python -m venv /)
+      }
+      const updatePip = `uv pip install --exclude-newer-package pip=false "pip>=${PIP_MIN_VERSION}"`
+      if (scenario.venv && !scenario.version) {
+        assert.equal(command.split(updatePip).length - 1, 1)
+        assert.ok(command.indexOf(updatePip) > command.lastIndexOf('activate'))
+        assert.ok(command.includes(shell.isPowerShell()
+          ? `${updatePip}; if ($LASTEXITCODE -ne 0) { exit 1 }`
+          : `${updatePip} || exit 1`))
+      } else {
+        assert.doesNotMatch(command, /uv pip install/)
       }
       assert.equal(shell.env.UV_PYTHON_PREFERENCE, 'only-managed')
     }
   }
 })
+
+
+test('failed pip updates stop the application even with an unconditional command chain', async t => {
+  if (process.platform === 'win32') return t.skip('executes the POSIX shell failure guard')
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-pip-failure-'))
+  t.after(() => fs.rm(root, { recursive: true, force: true }))
+  const binDir = path.join(root, 'bin')
+  await fs.mkdir(path.join(root, 'env', 'bin'), { recursive: true })
+  await fs.mkdir(binDir)
+  await fs.writeFile(path.join(root, 'env', 'bin', 'activate'), 'true\n')
+  await fs.writeFile(path.join(binDir, 'uv'), '#!/bin/sh\nexit "$PINOKIO_TEST_UV_EXIT_CODE"\n', { mode: 0o755 })
+  const shell = createShell(createKernel(root))
+  shell.shell = 'bash'
+  const params = await shell.activate({
+    path: root, conda: { skip: true }, venv: 'env',
+    chain: '*', message: 'echo PINOKIO_APPLICATION_RAN',
+  })
+  const command = shell.build(params)
+  for (const exitCode of [0, 7]) {
+    const result = spawnSync('/bin/bash', ['-c', command], {
+      encoding: 'utf8',
+      env: { ...process.env, PATH: `${binDir}${path.delimiter}${process.env.PATH}`, PINOKIO_TEST_UV_EXIT_CODE: String(exitCode) },
+    })
+    assert.equal(result.status, exitCode ? 1 : 0, result.stderr)
+    assert.equal(result.stdout.includes('PINOKIO_APPLICATION_RAN'), exitCode === 0)
+  }
+})