Skip to content

Commit 45ce599

Browse files
authored
Reduce memory footprint + support httpcore==1.* pip constraint (#351)
* Update mambajs and untarjs * Reduce untarjs memory footprint by cleaning it up once done using it * Lint * No need to depend on untarjs, we let mambajs handle it
1 parent f440a91 commit 45ce599

File tree

4 files changed

+16
-23
lines changed

4 files changed

+16
-23
lines changed

packages/xeus-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"watch:src": "tsc -w --sourceMap"
3434
},
3535
"dependencies": {
36-
"@emscripten-forge/mambajs-core": "^0.19.13",
36+
"@emscripten-forge/mambajs-core": "^0.20.3",
3737
"@jupyterlab/coreutils": "^6.5.0",
3838
"@jupyterlab/services": "^7.5.0",
3939
"@jupyterlite/services": "^0.7.0",

packages/xeus/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"watch:src": "tsc -w --sourceMap"
3737
},
3838
"dependencies": {
39-
"@emscripten-forge/mambajs": "^0.19.13",
40-
"@emscripten-forge/untarjs": "^5.3.2",
39+
"@emscripten-forge/mambajs": "^0.20.3",
4140
"@jupyterlab/coreutils": "^6.5.0",
4241
"@jupyterlab/services": "^7.5.0",
4342
"@jupyterlite/services": "^0.7.0",

packages/xeus/src/worker.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
showPipPackagesList,
2626
updatePackagesInEmscriptenFS
2727
} from '@emscripten-forge/mambajs-core';
28-
import type { IUnpackJSAPI } from '@emscripten-forge/untarjs';
2928
import { XeusRemoteKernelBase } from '@jupyterlite/xeus-core';
3029
import type { IEmpackXeusWorkerKernel } from './interfaces';
3130

@@ -135,7 +134,6 @@ export abstract class EmpackedXeusRemoteKernel extends XeusRemoteKernelBase {
135134

136135
this._paths = bootstrapped.paths;
137136
this._pythonVersion = bootstrapped.pythonVersion;
138-
this._untarjs = bootstrapped.untarjs;
139137
this._sharedLibs = bootstrapped.sharedLibs;
140138
}
141139

@@ -281,7 +279,6 @@ export abstract class EmpackedXeusRemoteKernel extends XeusRemoteKernelBase {
281279
oldLock: this._lock,
282280
pythonVersion: this._pythonVersion,
283281
Module: this.Module,
284-
untarjs: this._untarjs,
285282
logger: this.logger,
286283
paths: this._paths
287284
});
@@ -322,8 +319,6 @@ export abstract class EmpackedXeusRemoteKernel extends XeusRemoteKernelBase {
322319
private _kernelSharedLibs = new Set<string>();
323320
private _lock: ILock;
324321
private _paths = {};
325-
326-
private _untarjs: IUnpackJSAPI | undefined;
327322
}
328323

329324
export namespace XeusRemoteKernel {

yarn.lock

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,35 +74,35 @@ __metadata:
7474
languageName: node
7575
linkType: hard
7676

77-
"@emscripten-forge/mambajs-core@npm:^0.19.13":
78-
version: 0.19.13
79-
resolution: "@emscripten-forge/mambajs-core@npm:0.19.13"
77+
"@emscripten-forge/mambajs-core@npm:^0.20.3":
78+
version: 0.20.3
79+
resolution: "@emscripten-forge/mambajs-core@npm:0.20.3"
8080
dependencies:
8181
"@emscripten-forge/untarjs": ^5.3.2
8282
yaml: ^2.7.0
83-
checksum: d26ff4137d460100ac7eb386282ff3c8d916f8feaa329dd915021b2755d3999c1d3d56eeeb1acc07af828e2b0de75f8dc918a37f63f7b0bb3c4989a62522dde6
83+
checksum: 03579f7df444a7f9759efc5e635f577307f3b800e5438a0bfe855197eeaae062686c72772d4a1fceb609b6a027074a4ddcc5eb258d3cd5c52278221f80d4cc00
8484
languageName: node
8585
linkType: hard
8686

87-
"@emscripten-forge/mambajs@npm:^0.19.13":
88-
version: 0.19.13
89-
resolution: "@emscripten-forge/mambajs@npm:0.19.13"
87+
"@emscripten-forge/mambajs@npm:^0.20.3":
88+
version: 0.20.3
89+
resolution: "@emscripten-forge/mambajs@npm:0.20.3"
9090
dependencies:
9191
"@conda-org/rattler": ^0.3.5
92-
"@emscripten-forge/mambajs-core": ^0.19.13
92+
"@emscripten-forge/mambajs-core": ^0.20.3
9393
yaml: ^2.7.0
94-
checksum: 43dcba4b6704bc4f85e13e214fbcf7442a49bb9bdb93cb50bb082c3e933e618c95051a69c67a07587c86431ed95cf1bda611e8b0877695d60845df9b6ea3ec20
94+
checksum: 4b4240e31c76a1b4e6b853b7c25743978ba4536c009b423789df0ad7c30052686c9316b2b50b91f5c8ed6ebbacf24d5c0ef67d8191a6d766246e8d74df36d9be
9595
languageName: node
9696
linkType: hard
9797

9898
"@emscripten-forge/untarjs@npm:^5.3.2":
99-
version: 5.3.2
100-
resolution: "@emscripten-forge/untarjs@npm:5.3.2"
99+
version: 5.3.3
100+
resolution: "@emscripten-forge/untarjs@npm:5.3.3"
101101
dependencies:
102102
assert: ^2.1.0
103103
process: ^0.11.10
104104
url: ^0.11.4
105-
checksum: c7ff7bfedfcc1055785731bfbdd4c8911f2448a2b8674a3bdd879affa69eb41bddd36c2d0c74850309a77aa0821c617036b5a2fc6aebe35cbe1738d8dc77045b
105+
checksum: e6c1f1567f6d57fcfdca990cc07a8175a78b8841fb7ebf42732f9abcea3c28bd9f84d93bb5bb8dbf7561e468713db96c8588f9c84d53fd54b1d235eacdedbc04
106106
languageName: node
107107
linkType: hard
108108

@@ -787,7 +787,7 @@ __metadata:
787787
version: 0.0.0-use.local
788788
resolution: "@jupyterlite/xeus-core@workspace:packages/xeus-core"
789789
dependencies:
790-
"@emscripten-forge/mambajs-core": ^0.19.13
790+
"@emscripten-forge/mambajs-core": ^0.20.3
791791
"@jupyterlab/coreutils": ^6.5.0
792792
"@jupyterlab/services": ^7.5.0
793793
"@jupyterlite/services": ^0.7.0
@@ -853,8 +853,7 @@ __metadata:
853853
version: 0.0.0-use.local
854854
resolution: "@jupyterlite/xeus@workspace:packages/xeus"
855855
dependencies:
856-
"@emscripten-forge/mambajs": ^0.19.13
857-
"@emscripten-forge/untarjs": ^5.3.2
856+
"@emscripten-forge/mambajs": ^0.20.3
858857
"@jupyterlab/coreutils": ^6.5.0
859858
"@jupyterlab/services": ^7.5.0
860859
"@jupyterlite/services": ^0.7.0

0 commit comments

Comments
 (0)