Skip to content

Commit 6a748d7

Browse files
authored
Update to JupyterLite 0.7.0rc0 (#240)
* Update to JupyterLite 0.7.0rc0 * update yarn.lock * more bumps and import updates * fix import * import from lib * try dynamic import only * import from lib from other places
1 parent dbad325 commit 6a748d7

File tree

13 files changed

+1087
-1076
lines changed

13 files changed

+1087
-1076
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
- name: Install the extension
197197
run: |
198198
set -eux
199-
python -m pip install "jupyterlab>=4.5.0rc0,<4.6.0" dist/jupyterlite_pyodide_kernel*.whl
199+
python -m pip install "jupyterlab>=4.5.0,<4.6.0" dist/jupyterlite_pyodide_kernel*.whl
200200
201201
- name: Install dependencies
202202
working-directory: ui-tests

packages/pyodide-kernel-extension/package.json

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,15 @@
4747
"watch:labextension": "jupyter labextension watch ."
4848
},
4949
"dependencies": {
50-
"@jupyterlab/application": "^4.5.0-rc.0",
51-
"@jupyterlab/coreutils": "^6.5.0-rc.0",
52-
"@jupyterlab/logconsole": "^4.5.0-rc.0",
53-
"@jupyterlite/contents": "^0.7.0-beta.1",
54-
"@jupyterlite/kernel": "^0.7.0-beta.1",
50+
"@jupyterlab/application": "^4.5.0",
51+
"@jupyterlab/coreutils": "^6.5.0",
52+
"@jupyterlab/logconsole": "^4.5.0",
53+
"@jupyterlite/apputils": "^0.7.0-rc.0",
5554
"@jupyterlite/pyodide-kernel": "^0.7.0-beta.0",
56-
"@jupyterlite/server": "^0.7.0-beta.1"
55+
"@jupyterlite/services": "^0.7.0-rc.0"
5756
},
5857
"devDependencies": {
59-
"@jupyterlab/builder": "^4.5.0-rc.0",
58+
"@jupyterlab/builder": "^4.5.0",
6059
"rimraf": "^6.0.1",
6160
"typescript": "~5.2.2"
6261
},
@@ -68,15 +67,7 @@
6867
"outputDir": "../../jupyterlite_pyodide_kernel/labextension",
6968
"webpackConfig": "webpack.config.js",
7069
"sharedPackages": {
71-
"@jupyterlite/kernel": {
72-
"bundled": false,
73-
"singleton": true
74-
},
75-
"@jupyterlite/server": {
76-
"bundled": false,
77-
"singleton": true
78-
},
79-
"@jupyterlite/contents": {
70+
"@jupyterlite/services": {
8071
"bundled": false,
8172
"singleton": true
8273
}

packages/pyodide-kernel-extension/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { PageConfig, URLExt } from '@jupyterlab/coreutils';
77

88
import { ILoggerRegistry, ILogPayload } from '@jupyterlab/logconsole';
99

10-
import { IServiceWorkerManager } from '@jupyterlite/server';
10+
import { IServiceWorkerManager } from '@jupyterlite/apputils';
1111

12-
import { IKernel, IKernelSpecs } from '@jupyterlite/kernel';
12+
import { IKernel, IKernelSpecs } from '@jupyterlite/services';
1313

1414
import KERNEL_ICON_SVG_STR from '../style/img/pyodide.svg';
1515

packages/pyodide-kernel/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@
5050
"watch": "tsc -b --watch"
5151
},
5252
"dependencies": {
53-
"@jupyterlab/coreutils": "^6.5.0-beta.1",
54-
"@jupyterlab/logconsole": "^4.5.0-beta.1",
55-
"@jupyterlite/contents": "^0.7.0-beta.1",
56-
"@jupyterlite/kernel": "^0.7.0-beta.1",
53+
"@jupyterlab/coreutils": "^6.5.0",
54+
"@jupyterlab/logconsole": "^4.5.0",
55+
"@jupyterlite/services": "^0.7.0-rc.0",
5756
"coincident": "^1.2.3",
5857
"comlink": "^4.4.2"
5958
},

packages/pyodide-kernel/src/coincident.worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
TDriveMethod,
1313
TDriveRequest,
1414
TDriveResponse,
15-
} from '@jupyterlite/contents';
15+
} from '@jupyterlite/services/lib/contents/drivefs';
1616

1717
import { ICoincidentPyodideWorkerKernel, IPyodideWorkerKernel } from './tokens';
1818

packages/pyodide-kernel/src/comlink.worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { URLExt } from '@jupyterlab/coreutils';
1111

1212
import { KernelMessage } from '@jupyterlab/services';
1313

14-
import { DriveFS } from '@jupyterlite/contents';
14+
import { DriveFS } from '@jupyterlite/services/lib/contents/drivefs';
1515

1616
import { IPyodideWorkerKernel } from './tokens';
1717

packages/pyodide-kernel/src/kernel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { ILogPayload } from '@jupyterlab/logconsole';
1010

1111
import { Contents, KernelMessage } from '@jupyterlab/services';
1212

13-
import { BaseKernel, IKernel } from '@jupyterlite/kernel';
13+
import { BaseKernel, IKernel } from '@jupyterlite/services';
1414

1515
import type {
1616
ICoincidentPyodideWorkerKernel,
@@ -25,7 +25,7 @@ import {
2525
DriveContentsProcessor,
2626
TDriveMethod,
2727
TDriveRequest,
28-
} from '@jupyterlite/contents';
28+
} from '@jupyterlite/services';
2929

3030
/**
3131
* A kernel that executes Python code with Pyodide.

packages/pyodide-kernel/src/tokens.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
* Definitions for the Pyodide kernel.
66
*/
77

8-
import { TDriveMethod, TDriveRequest, TDriveResponse } from '@jupyterlite/contents';
9-
import { IWorkerKernel } from '@jupyterlite/kernel';
8+
import {
9+
TDriveMethod,
10+
TDriveRequest,
11+
TDriveResponse,
12+
IWorkerKernel,
13+
} from '@jupyterlite/services';
1014

1115
/**
1216
* The schema for a Warehouse-like index, as used by piplite.

packages/pyodide-kernel/src/worker.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type { ILogPayload } from '@jupyterlab/logconsole';
77

88
import { KernelMessage } from '@jupyterlab/services';
99

10-
import type { DriveFS } from '@jupyterlite/contents';
10+
import type { DriveFS } from '@jupyterlite/services/lib/contents/drivefs';
1111

1212
import type { IPyodideWorkerKernel } from './tokens';
1313

@@ -169,7 +169,8 @@ ${e.stack}`;
169169
const mountpoint = '/drive';
170170
const { FS, PATH, ERRNO_CODES } = this._pyodide;
171171
const { baseUrl } = options;
172-
const { DriveFS } = await import('@jupyterlite/contents');
172+
// Use direct submodule import for tree-shaking
173+
const { DriveFS } = await import('@jupyterlite/services/lib/contents/drivefs');
173174

174175
const driveFS = new DriveFS({
175176
FS: FS as any,

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
requires = [
33
"hatchling >=1.4.0",
4-
"jupyterlab >=4.5.0rc0,<4.6.0",
4+
"jupyterlab >=4.5.0,<4.6.0",
55
]
66
build-backend = "hatchling.build"
77

@@ -37,7 +37,7 @@ classifiers = [
3737
"Programming Language :: Python :: 3.14",
3838
]
3939
dependencies = [
40-
"jupyterlite-core >=0.7.0b1,<0.8.0",
40+
"jupyterlite-core >=0.7.0rc0,<0.8.0",
4141
"pkginfo"
4242
]
4343

@@ -59,7 +59,7 @@ jupyterlite-pyodide-kernel-pyodide = "jupyterlite_pyodide_kernel.addons.pyodide:
5959
dev = [
6060
"build",
6161
"hatch",
62-
"jupyterlab >=4.5.0rc0,<4.6.0",
62+
"jupyterlab >=4.5.0,<4.6.0",
6363
]
6464

6565
lint = [
@@ -118,11 +118,11 @@ version_cmd = "python scripts/bump-version.py"
118118

119119
[tool.jupyter-releaser.hooks]
120120
before-bump-version = [
121-
"python -m pip install 'jupyterlab~=4.5.0rc0'",
121+
"python -m pip install 'jupyterlab~=4.5.0'",
122122
"jlpm"
123123
]
124124
before-build-npm = [
125-
"python -m pip install 'jupyterlab~=4.5.0rc0' hatch",
125+
"python -m pip install 'jupyterlab~=4.5.0' hatch",
126126
"python -m pip install -e .[dev]",
127127
"jlpm",
128128
"jlpm build:prod",

0 commit comments

Comments
 (0)