pinokiod 3.6.39 → 3.6.41

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.
Files changed (3) hide show
  1. package/kernel/bin/conda.js +41 -22
  2. package/kernel/bin/index.js +8 -5
  3. package/package.json +1 -1
package/kernel/bin/conda.js CHANGED
@@ -10,21 +10,30 @@ class Conda {
10
10
  //arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_23.5.2-0-MacOSX-arm64.sh"
11
11
  //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-MacOSX-x86_64.sh",
12
12
  //arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-MacOSX-arm64.sh"
13
- x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-MacOSX-x86_64.sh",
14
- arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-MacOSX-arm64.sh"
13
+
14
+ //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-MacOSX-x86_64.sh",
15
+ //arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-MacOSX-arm64.sh"
16
+
17
+ x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.1.1-2-MacOSX-x86_64.sh",
18
+ arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.1.1-2-MacOSX-arm64.sh"
15
19
  },
16
20
  win32: {
17
21
  //x64: "https://github.com/cocktailpeanut/miniconda/releases/download/v23.5.2/Miniconda3-py310_23.5.2-0-Windows-x86_64.exe",
18
22
  //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Windows-x86_64.exe"
19
- x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Windows-x86_64.exe"
23
+
24
+ //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Windows-x86_64.exe"
25
+ x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.1.1-2-Windows-x86_64.exe",
20
26
  },
21
27
  linux: {
22
28
  //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_23.5.2-0-Linux-x86_64.sh",
23
29
  //arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_23.5.2-0-Linux-aarch64.sh"
24
30
  //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Linux-x86_64.sh",
25
31
  //arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Linux-aarch64.sh"
26
- x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Linux-x86_64.sh",
27
- arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Linux-aarch64.sh"
32
+
33
+ //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Linux-x86_64.sh",
34
+ //arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Linux-aarch64.sh"
35
+ x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.1.1-2-Linux-x86_64.sh",
36
+ arm64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.1.1-2-Linux-aarch64.sh"
28
37
  }
29
38
  }
30
39
  installer = {
@@ -81,7 +90,8 @@ report_errors: false`)
81
90
  let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
82
91
  if (pinned_exists) {
83
92
  //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3`)
84
- await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
93
+ await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "sqlite ==3.47.2")
94
+ // await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
85
95
  //sqlite ==3.47.2`)
86
96
  // await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
87
97
  // await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
@@ -140,17 +150,20 @@ report_errors: false`)
140
150
 
141
151
  // Use sqlite to check if `conda update -y --all` went through successfully
142
152
  // 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
- // }
153
+ if (name === "sqlite") {
154
+ if (String(version) === "3.47.2") {
155
+ conda_check.sqlite = true
156
+ }
157
+ //let coerced = semver.coerce(version)
158
+ //let sqlite_requirement = ">=3.47.2"
159
+ //if (semver.satisfies(coerced, sqlite_requirement)) {
160
+ // console.log("semver satisfied")
161
+
162
+ // conda_check.sqlite = true
163
+ //} else {
164
+ // console.log("semver NOT satisfied")
165
+ //}
166
+ }
154
167
  }
155
168
  } else {
156
169
  if (/.*name.*version.*build.*channel/i.test(line)) {
@@ -160,8 +173,8 @@ report_errors: false`)
160
173
  }
161
174
  console.log("> Check", { conda_check, conda })
162
175
  this.kernel.bin.installed.conda = conda
163
- //return conda_check.conda && conda_check.mamba && conda_check.sqlite
164
- return conda_check.conda && conda_check.mamba
176
+ return conda_check.conda && conda_check.mamba && conda_check.sqlite
177
+ //return conda_check.conda && conda_check.mamba
165
178
  }
166
179
  async install(req, ondata) {
167
180
  for(let i=0; i<5; i++) {
@@ -211,7 +224,8 @@ report_errors: false`)
211
224
  if (pinned_exists) {
212
225
  //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
213
226
  //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3`)
214
- await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
227
+ await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "sqlite ==3.47.2")
228
+ //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
215
229
  //sqlite ==3.47.2`)
216
230
  // await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
217
231
  // await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
@@ -235,6 +249,7 @@ report_errors: false`)
235
249
  let cmds = [
236
250
  //"conda clean -y --index-cache",
237
251
  "conda clean -y --all",
252
+ "conda install -y -c conda-forge sqlite=3.47.2",
238
253
 
239
254
  // `conda config --file ${this.kernel.path('condarc')} --set remote_connect_timeout_secs 20`,
240
255
  // `conda config --file ${this.kernel.path('condarc')} --set remote_read_timeout_secs 300`,
@@ -256,8 +271,12 @@ report_errors: false`)
256
271
  //"conda install -y conda-libmamba-solver=24.11.1 conda=24.11.2",
257
272
  //"conda update -y conda-libmamba-solver",
258
273
  //"conda update -y conda sqlite",// -vvv --debug",
259
- "conda update -y conda",// -vvv --debug",
260
- "conda update -y --all",// -vvv --debug",
274
+
275
+
276
+ // "conda update -y conda",// -vvv --debug",
277
+ // "conda update -y --all",// -vvv --debug",
278
+
279
+
261
280
  // "python -m pip install --upgrade pip setuptools wheel",
262
281
  // "python -m ensurepip --upgrade",
263
282
  // "conda update -y conda",
package/kernel/bin/index.js CHANGED
@@ -353,7 +353,10 @@ 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") {
356
+ if (name === "sqlite") {
357
+ if (String(version) === "3.47.2") {
358
+ conda_check.sqlite = true
359
+ }
357
360
  // let coerced = semver.coerce(version)
358
361
  // let sqlite_requirement = ">=3.47.2"
359
362
  // // console.log({ coerced, version, sqlite_requirement })
@@ -363,8 +366,8 @@ class Bin {
363
366
  // conda_check.sqlite = true
364
367
  // } else {
365
368
  // console.log("semver NOT satisfied")
366
- // }
367
- // }
369
+ }
370
+ }
368
371
  }
369
372
  } else {
370
373
  if (/.*name.*version.*build.*channel/i.test(line)) {
@@ -374,8 +377,8 @@ class Bin {
374
377
  }
375
378
 
376
379
  console.log({ conda_check })
377
- //if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
378
- if (conda_check.conda && conda_check.mamba) {
380
+ if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
381
+ //if (conda_check.conda && conda_check.mamba) {
379
382
  this.correct_conda = true
380
383
  }
381
384
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pinokiod",
3
- "version": "3.6.39",
3
+ "version": "3.6.41",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {