pinokiod 3.6.38 → 3.6.39
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 +13 -12
- package/kernel/bin/index.js +14 -13
- package/package.json +1 -1
package/kernel/bin/conda.js
CHANGED
|
@@ -140,17 +140,17 @@ report_errors: false`)
|
|
|
140
140
|
|
|
141
141
|
// Use sqlite to check if `conda update -y --all` went through successfully
|
|
142
142
|
// sometimes it just fails silently so need to check
|
|
143
|
-
if (name === "sqlite") {
|
|
144
|
-
let coerced = semver.coerce(version)
|
|
145
|
-
let sqlite_requirement = ">=3.47.2"
|
|
146
|
-
if (semver.satisfies(coerced, sqlite_requirement)) {
|
|
147
|
-
console.log("semver satisfied")
|
|
148
|
-
|
|
149
|
-
conda_check.sqlite = true
|
|
150
|
-
} else {
|
|
151
|
-
console.log("semver NOT satisfied")
|
|
152
|
-
}
|
|
153
|
-
}
|
|
143
|
+
// if (name === "sqlite") {
|
|
144
|
+
// let coerced = semver.coerce(version)
|
|
145
|
+
// let sqlite_requirement = ">=3.47.2"
|
|
146
|
+
// if (semver.satisfies(coerced, sqlite_requirement)) {
|
|
147
|
+
// console.log("semver satisfied")
|
|
148
|
+
//
|
|
149
|
+
// conda_check.sqlite = true
|
|
150
|
+
// } else {
|
|
151
|
+
// console.log("semver NOT satisfied")
|
|
152
|
+
// }
|
|
153
|
+
// }
|
|
154
154
|
}
|
|
155
155
|
} else {
|
|
156
156
|
if (/.*name.*version.*build.*channel/i.test(line)) {
|
|
@@ -160,7 +160,8 @@ report_errors: false`)
|
|
|
160
160
|
}
|
|
161
161
|
console.log("> Check", { conda_check, conda })
|
|
162
162
|
this.kernel.bin.installed.conda = conda
|
|
163
|
-
return conda_check.conda && conda_check.mamba && conda_check.sqlite
|
|
163
|
+
//return conda_check.conda && conda_check.mamba && conda_check.sqlite
|
|
164
|
+
return conda_check.conda && conda_check.mamba
|
|
164
165
|
}
|
|
165
166
|
async install(req, ondata) {
|
|
166
167
|
for(let i=0; i<5; i++) {
|
package/kernel/bin/index.js
CHANGED
|
@@ -353,18 +353,18 @@ class Bin {
|
|
|
353
353
|
}
|
|
354
354
|
// Use sqlite to check if `conda update -y --all` went through successfully
|
|
355
355
|
// sometimes it just fails silently so need to check
|
|
356
|
-
if (name === "sqlite") {
|
|
357
|
-
let coerced = semver.coerce(version)
|
|
358
|
-
let sqlite_requirement = ">=3.47.2"
|
|
359
|
-
// console.log({ coerced, version, sqlite_requirement })
|
|
360
|
-
if (semver.satisfies(coerced, sqlite_requirement)) {
|
|
361
|
-
console.log("semver satisfied")
|
|
362
|
-
|
|
363
|
-
conda_check.sqlite = true
|
|
364
|
-
} else {
|
|
365
|
-
console.log("semver NOT satisfied")
|
|
366
|
-
}
|
|
367
|
-
}
|
|
356
|
+
// if (name === "sqlite") {
|
|
357
|
+
// let coerced = semver.coerce(version)
|
|
358
|
+
// let sqlite_requirement = ">=3.47.2"
|
|
359
|
+
// // console.log({ coerced, version, sqlite_requirement })
|
|
360
|
+
// if (semver.satisfies(coerced, sqlite_requirement)) {
|
|
361
|
+
// console.log("semver satisfied")
|
|
362
|
+
//
|
|
363
|
+
// conda_check.sqlite = true
|
|
364
|
+
// } else {
|
|
365
|
+
// console.log("semver NOT satisfied")
|
|
366
|
+
// }
|
|
367
|
+
// }
|
|
368
368
|
}
|
|
369
369
|
} else {
|
|
370
370
|
if (/.*name.*version.*build.*channel/i.test(line)) {
|
|
@@ -374,7 +374,8 @@ class Bin {
|
|
|
374
374
|
}
|
|
375
375
|
|
|
376
376
|
console.log({ conda_check })
|
|
377
|
-
if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
|
|
377
|
+
//if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
|
|
378
|
+
if (conda_check.conda && conda_check.mamba) {
|
|
378
379
|
this.correct_conda = true
|
|
379
380
|
}
|
|
380
381
|
}
|