pinokiod 3.2.119 → 3.2.121
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.js +3 -5
- package/kernel/bin/index.js +16 -9
- package/package.json +1 -1
package/kernel/bin/conda.js
CHANGED
|
@@ -69,8 +69,7 @@ create_default_packages:
|
|
|
69
69
|
}
|
|
70
70
|
let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
|
|
71
71
|
if (pinned_exists) {
|
|
72
|
-
await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1
|
|
73
|
-
conda-libmamba-solver=24.11.1`)
|
|
72
|
+
await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
|
|
74
73
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
|
|
75
74
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
|
|
76
75
|
//conda-libmamba-solver=24.11.1`)
|
|
@@ -117,8 +116,7 @@ conda-libmamba-solver=24.11.1`)
|
|
|
117
116
|
// set pinned
|
|
118
117
|
let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
|
|
119
118
|
if (pinned_exists) {
|
|
120
|
-
await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1
|
|
121
|
-
conda-libmamba-solver=24.11.1`)
|
|
119
|
+
await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
|
|
122
120
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
|
|
123
121
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
|
|
124
122
|
//conda-libmamba-solver=24.11.1`)
|
|
@@ -146,7 +144,7 @@ conda-libmamba-solver=24.11.1`)
|
|
|
146
144
|
`conda config --file ${this.kernel.path('condarc')} --set remote_max_retries 6`,
|
|
147
145
|
`conda config --file ${this.kernel.path('condarc')} --set repodata_threads 4`,
|
|
148
146
|
`conda config --file ${this.kernel.path('condarc')} --set fetch_threads 5`,
|
|
149
|
-
"conda install -y -c conda-forge conda-libmamba-solver=24.11.1",
|
|
147
|
+
// "conda install -y -c conda-forge conda-libmamba-solver=24.11.1",
|
|
150
148
|
// "conda install libsqlite --force-reinstall -y",
|
|
151
149
|
// `conda config --file ${this.kernel.path('condarc')} --set auto_update_conda False`,
|
|
152
150
|
//"conda install -y conda=24.9.0 -vvv --strict-channel-priority",
|
package/kernel/bin/index.js
CHANGED
|
@@ -277,14 +277,20 @@ class Bin {
|
|
|
277
277
|
conda_check.conda = true
|
|
278
278
|
}
|
|
279
279
|
}
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
if (String(version) === "24.
|
|
285
|
-
|
|
286
|
-
}
|
|
287
|
-
|
|
280
|
+
|
|
281
|
+
// // check conda-libmamba-solver is up to date
|
|
282
|
+
// // sometimes it just fails silently so need to check
|
|
283
|
+
// if (name === "conda-libmamba-solver") {
|
|
284
|
+
// //if (String(version) === "24.7.0") {
|
|
285
|
+
// let channel = chunks[3]
|
|
286
|
+
// console.log({ name, channel, version })
|
|
287
|
+
// if (String(version) === "24.11.1" && channel === "conda-forge") {
|
|
288
|
+
// conda_check.mamba = true
|
|
289
|
+
// }
|
|
290
|
+
// }
|
|
291
|
+
|
|
292
|
+
// Use sqlite to check if `conda update -y --all` went through successfully
|
|
293
|
+
// sometimes it just fails silently so need to check
|
|
288
294
|
if (name === "sqlite") {
|
|
289
295
|
let coerced = semver.coerce(version)
|
|
290
296
|
let sqlite_requirement = ">=3.47.2"
|
|
@@ -306,7 +312,8 @@ class Bin {
|
|
|
306
312
|
}
|
|
307
313
|
|
|
308
314
|
console.log({ conda_check })
|
|
309
|
-
if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
|
|
315
|
+
//if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
|
|
316
|
+
if (conda_check.conda && conda_check.sqlite) {
|
|
310
317
|
//if (conda_check.conda) {
|
|
311
318
|
this.correct_conda = true
|
|
312
319
|
}
|