pinokiod 7.5.32 → 7.5.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/bin/conda-pins.js +1 -1
- package/kernel/bin/conda.js +1 -3
- package/package.json +1 -1
- package/server/views/app.ejs +1 -4
- package/test/conda-bin.test.js +3 -15
package/kernel/bin/conda-pins.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const semver = require('semver')
|
|
2
2
|
|
|
3
|
-
const CONDA_PIN_VERSION = "26.
|
|
3
|
+
const CONDA_PIN_VERSION = "26.3.2"
|
|
4
4
|
const PYTHON_PIN_VERSION = "3.10.20"
|
|
5
5
|
const PYTHON_INSTALL_SPEC = `python=${PYTHON_PIN_VERSION}`
|
|
6
6
|
const WINDOWS_PYTHON_SSL_FIX_SPEC = `${PYTHON_INSTALL_SPEC}=*_1_cpython`
|
package/kernel/bin/conda.js
CHANGED
|
@@ -205,8 +205,7 @@ report_errors: false`)
|
|
|
205
205
|
conda_versions[name] = version
|
|
206
206
|
conda_builds[name] = build
|
|
207
207
|
if (name === "conda") {
|
|
208
|
-
|
|
209
|
-
conda_check.conda = coerced && semver.eq(coerced, CONDA_PIN_VERSION)
|
|
208
|
+
conda_check.conda = true
|
|
210
209
|
}
|
|
211
210
|
// check conda-libmamba-solver is up to date
|
|
212
211
|
// sometimes it just fails silently so need to check
|
|
@@ -309,7 +308,6 @@ report_errors: false`)
|
|
|
309
308
|
|
|
310
309
|
let condaPackages = [
|
|
311
310
|
this.kernel.platform === "win32" ? `"${WINDOWS_PYTHON_SSL_FIX_SPEC}"` : `"${PYTHON_INSTALL_SPEC}"`,
|
|
312
|
-
`"conda=${CONDA_PIN_VERSION}"`,
|
|
313
311
|
`"conda-libmamba-solver>=25.4.0"`,
|
|
314
312
|
]
|
|
315
313
|
|
package/package.json
CHANGED
package/server/views/app.ejs
CHANGED
|
@@ -11040,9 +11040,6 @@ const rerenderMenuSection = (container, html) => {
|
|
|
11040
11040
|
try {
|
|
11041
11041
|
setLogsNewBadge(window.sessionStorage.getItem(logsNotificationKey) === "1")
|
|
11042
11042
|
} catch (_) {}
|
|
11043
|
-
if (document.querySelector(".appcanvas") && document.querySelector(".appcanvas").dataset.pageError === "1") {
|
|
11044
|
-
setLogsNewBadge(true)
|
|
11045
|
-
}
|
|
11046
11043
|
const pluginInstallPreflightCache = new Map()
|
|
11047
11044
|
const normalizePluginPathFromLaunchHref = (rawHref) => {
|
|
11048
11045
|
if (!rawHref || typeof rawHref !== "string") {
|
|
@@ -12351,7 +12348,7 @@ const rerenderMenuSection = (container, html) => {
|
|
|
12351
12348
|
}
|
|
12352
12349
|
return
|
|
12353
12350
|
}
|
|
12354
|
-
if (event.data.e === "pinokio:logs-new" || event.data.type === "pinokio:logs-new"
|
|
12351
|
+
if (event.data.e === "pinokio:logs-new" || event.data.type === "pinokio:logs-new") {
|
|
12355
12352
|
setLogsNewBadge(true)
|
|
12356
12353
|
return
|
|
12357
12354
|
}
|
package/test/conda-bin.test.js
CHANGED
|
@@ -7,7 +7,6 @@ const test = require('node:test')
|
|
|
7
7
|
|
|
8
8
|
const Conda = require('../kernel/bin/conda')
|
|
9
9
|
const {
|
|
10
|
-
CONDA_PIN_VERSION,
|
|
11
10
|
PYTHON_INSTALL_SPEC,
|
|
12
11
|
WINDOWS_PYTHON_SSL_FIX_SPEC,
|
|
13
12
|
isExpectedPythonPinned,
|
|
@@ -43,7 +42,7 @@ async function writeCondaMeta(root, name, version, build = 'py_0') {
|
|
|
43
42
|
}
|
|
44
43
|
|
|
45
44
|
async function writeHealthyCondaMeta(root, platform = 'win32') {
|
|
46
|
-
await writeCondaMeta(root, 'conda',
|
|
45
|
+
await writeCondaMeta(root, 'conda', '26.3.2', 'py310')
|
|
47
46
|
await writeCondaMeta(root, 'conda-libmamba-solver', '25.4.0', 'pyhd3eb1b0_0')
|
|
48
47
|
await writeCondaMeta(root, 'python', '3.10.20', platform === 'win32' ? 'h4de0772_1_cpython' : 'cpython')
|
|
49
48
|
}
|
|
@@ -205,7 +204,6 @@ test('Conda init patches Windows OpenSSL hooks for legacy Miniconda roots', asyn
|
|
|
205
204
|
})
|
|
206
205
|
|
|
207
206
|
test('Conda pins Python 3.10.20 consistently across platforms', async () => {
|
|
208
|
-
assert.equal(CONDA_PIN_VERSION, '26.5.2')
|
|
209
207
|
assert.equal(PYTHON_INSTALL_SPEC, 'python=3.10.20')
|
|
210
208
|
assert.equal(WINDOWS_PYTHON_SSL_FIX_SPEC, 'python=3.10.20=*_1_cpython')
|
|
211
209
|
|
|
@@ -239,7 +237,7 @@ test('Conda install requests the Python 3.10.20 pin on macOS/Linux', async () =>
|
|
|
239
237
|
assert.ok(condaInstall)
|
|
240
238
|
assert.equal(
|
|
241
239
|
condaInstall.message[1],
|
|
242
|
-
'conda install -y --override-channels -c conda-forge "python=3.10.20" "conda
|
|
240
|
+
'conda install -y --override-channels -c conda-forge "python=3.10.20" "conda-libmamba-solver>=25.4.0"'
|
|
243
241
|
)
|
|
244
242
|
})
|
|
245
243
|
|
|
@@ -267,7 +265,7 @@ test('Conda install keeps the Windows Python 3.10.20 SSL-fixed build pin', async
|
|
|
267
265
|
assert.ok(condaInstall)
|
|
268
266
|
assert.equal(
|
|
269
267
|
condaInstall.message[1],
|
|
270
|
-
'conda install -y --override-channels -c conda-forge "python=3.10.20=*_1_cpython" "conda
|
|
268
|
+
'conda install -y --override-channels -c conda-forge "python=3.10.20=*_1_cpython" "conda-libmamba-solver>=25.4.0"'
|
|
271
269
|
)
|
|
272
270
|
})
|
|
273
271
|
|
|
@@ -341,16 +339,6 @@ test('Conda check accepts a runnable managed Windows conda executable', async ()
|
|
|
341
339
|
assert.equal(await createConda(createKernel(root, 'win32')).check(), true)
|
|
342
340
|
})
|
|
343
341
|
|
|
344
|
-
test('Conda check rejects runnable installs with the wrong Conda version', async () => {
|
|
345
|
-
const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-smoke-wrong-version-'))
|
|
346
|
-
await writeCondaMeta(root, 'conda', '26.3.2', 'py310')
|
|
347
|
-
await writeCondaMeta(root, 'conda-libmamba-solver', '25.4.0', 'pyhd3eb1b0_0')
|
|
348
|
-
await writeCondaMeta(root, 'python', '3.10.20', 'h4de0772_1_cpython')
|
|
349
|
-
await writeFakeManagedConda(root, 'win32')
|
|
350
|
-
|
|
351
|
-
assert.equal(await createConda(createKernel(root, 'win32')).check(), false)
|
|
352
|
-
})
|
|
353
|
-
|
|
354
342
|
test('Conda install keeps the old runtime when the replacement installer download fails', async () => {
|
|
355
343
|
const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-download-fails-'))
|
|
356
344
|
const miniconda = await createLegacyMiniconda(root)
|