pinokiod 3.6.17 → 3.6.20
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 +6 -7
- package/kernel/bin/ffmpeg.js +4 -2
- package/kernel/bin/index.js +1 -1
- package/package.json +1 -1
package/kernel/bin/conda.js
CHANGED
|
@@ -79,15 +79,15 @@ report_errors: false`)
|
|
|
79
79
|
//report_errors: false`)
|
|
80
80
|
// }
|
|
81
81
|
let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
|
|
82
|
-
|
|
82
|
+
if (pinned_exists) {
|
|
83
83
|
await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3
|
|
84
|
-
sqlite ==3.
|
|
84
|
+
sqlite ==3.47.2`)
|
|
85
85
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
|
|
86
86
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
|
|
87
87
|
//conda-libmamba-solver=24.11.1`)
|
|
88
88
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.7.1
|
|
89
89
|
//conda-libmamba-solver=24.7.0`)
|
|
90
|
-
|
|
90
|
+
}
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
// async init() {
|
|
@@ -204,16 +204,16 @@ sqlite ==3.48.0`)
|
|
|
204
204
|
|
|
205
205
|
// set pinned
|
|
206
206
|
let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
|
|
207
|
-
|
|
207
|
+
if (pinned_exists) {
|
|
208
208
|
//await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
|
|
209
209
|
await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3
|
|
210
|
-
sqlite ==3.
|
|
210
|
+
sqlite ==3.47.2`)
|
|
211
211
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
|
|
212
212
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
|
|
213
213
|
//conda-libmamba-solver=24.11.1`)
|
|
214
214
|
// await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.7.1
|
|
215
215
|
//conda-libmamba-solver=24.7.0`)
|
|
216
|
-
|
|
216
|
+
}
|
|
217
217
|
//// await this.activate()
|
|
218
218
|
// await fs.promises.writeFile(this.kernel.bin.path('miniconda/condarc'), `channels:
|
|
219
219
|
// - conda-forge
|
|
@@ -250,7 +250,6 @@ sqlite ==3.48.0`)
|
|
|
250
250
|
//"conda install -y conda-libmamba-solver=24.11.1 conda=24.7.1",
|
|
251
251
|
//"conda install -y conda-libmamba-solver=24.11.1 conda=24.11.2",
|
|
252
252
|
//"conda update -y conda-libmamba-solver",
|
|
253
|
-
"conda install -y sqlite=3.48.0 -c conda-forge",
|
|
254
253
|
"conda update -y conda",// -vvv --debug",
|
|
255
254
|
"conda update -y --all",// -vvv --debug",
|
|
256
255
|
// "python -m pip install --upgrade pip setuptools wheel",
|
package/kernel/bin/ffmpeg.js
CHANGED
|
@@ -7,7 +7,8 @@ class Ffmpeg {
|
|
|
7
7
|
await this.kernel.bin.exec({
|
|
8
8
|
message: [
|
|
9
9
|
"conda clean -y --all",
|
|
10
|
-
"conda install -y -c conda-forge ffmpeg=5.1.2",
|
|
10
|
+
//"conda install -y -c conda-forge ffmpeg=5.1.2",
|
|
11
|
+
"conda install -y -c conda-forge ffmpeg sqlite==3.48.0",
|
|
11
12
|
]
|
|
12
13
|
// conda: {
|
|
13
14
|
// name: "base",
|
|
@@ -16,7 +17,8 @@ class Ffmpeg {
|
|
|
16
17
|
}, ondata)
|
|
17
18
|
}
|
|
18
19
|
async installed() {
|
|
19
|
-
return this.kernel.bin.installed.conda.has("ffmpeg") && this.kernel.bin.installed.conda_versions.
|
|
20
|
+
//return this.kernel.bin.installed.conda.has("ffmpeg") && this.kernel.bin.installed.conda_versions.sqlite === "3.48.0"
|
|
21
|
+
return this.kernel.bin.installed.conda.has("ffmpeg")
|
|
20
22
|
}
|
|
21
23
|
async uninstall(req, ondata) {
|
|
22
24
|
await this.kernel.bin.exec({
|
package/kernel/bin/index.js
CHANGED
|
@@ -310,7 +310,7 @@ class Bin {
|
|
|
310
310
|
// sometimes it just fails silently so need to check
|
|
311
311
|
if (name === "sqlite") {
|
|
312
312
|
let coerced = semver.coerce(version)
|
|
313
|
-
let sqlite_requirement = "
|
|
313
|
+
let sqlite_requirement = ">=3.47.2"
|
|
314
314
|
// console.log({ coerced, version, sqlite_requirement })
|
|
315
315
|
if (semver.satisfies(coerced, sqlite_requirement)) {
|
|
316
316
|
console.log("semver satisfied")
|