Skip to content

Commit fab477f

Browse files
jtpiojtpio
committed
Update to the latest beta
1 parent 23c1565 commit fab477f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+180
-163
lines changed

‎advanced/kernel-messaging/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
"url": "https://github.com/jupyterlab/extension-examples.git"
2626
},
2727
"scripts": {
28-
"build": "jlpm run build:lib",
28+
"build": "jlpm run build:lib && jlpm run build:labextension",
2929
"build:all": "jlpm run build:lib && jlpm run build:labextension",
3030
"build:labextension": "jupyter labextension build .",
31+
"build:labextension:dev": "jupyter labextension build --development True .",
3132
"build:lib": "tsc",
3233
"clean": "jlpm run clean:lib",
3334
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
@@ -42,19 +43,19 @@
4243
"watch:src": "tsc -w"
4344
},
4445
"dependencies": {
45-
"@jupyterlab/application": "^3.0.0-beta.8",
46-
"@jupyterlab/launcher": "^3.0.0-beta.8",
47-
"@jupyterlab/mainmenu": "^3.0.0-beta.8",
48-
"@jupyterlab/nbformat": "^3.0.0-beta.8",
49-
"@jupyterlab/translation": "^3.0.0-beta.8",
46+
"@jupyterlab/application": "~3.0.0-beta.6",
47+
"@jupyterlab/launcher": "~3.0.0-beta.6",
48+
"@jupyterlab/mainmenu": "~3.0.0-beta.6",
49+
"@jupyterlab/nbformat": "~3.0.0-beta.6",
50+
"@jupyterlab/translation": "~3.0.0-beta.6",
5051
"@lumino/algorithm": "^1.3.3",
5152
"@lumino/coreutils": "^1.5.3",
5253
"@lumino/datagrid": "^0.5.2",
5354
"@lumino/disposable": "^1.4.3",
5455
"@lumino/widgets": "^1.14.0"
5556
},
5657
"devDependencies": {
57-
"@jupyterlab/builder": "^3.0.0-beta.4",
58+
"@jupyterlab/builder": "^3.0.0-beta.6",
5859
"@typescript-eslint/eslint-plugin": "^2.27.0",
5960
"@typescript-eslint/parser": "^2.27.0",
6061
"eslint": "^7.5.0",

‎advanced/kernel-messaging/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"]
2+
requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"]
33
build-backend = "setuptools.build_meta"

‎advanced/kernel-messaging/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
)
4444

4545
cmdclass["jsdeps"] = combine_commands(
46-
install_npm(HERE, build_cmd="build:all", npm=["jlpm"]),
46+
install_npm(HERE, build_cmd="build", npm=["jlpm"]),
4747
ensure_targets(jstargets),
4848
)
4949

@@ -61,7 +61,7 @@
6161
cmdclass= cmdclass,
6262
packages=setuptools.find_packages(),
6363
install_requires=[
64-
"jupyterlab~=3.0.0b4",
64+
"jupyterlab>=3.0.0b6,==3.*",
6565
],
6666
zip_safe=False,
6767
include_package_data=True,

‎advanced/kernel-output/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
"url": "https://github.com/jupyterlab/extension-examples.git"
2626
},
2727
"scripts": {
28-
"build": "jlpm run build:lib",
28+
"build": "jlpm run build:lib && jlpm run build:labextension",
2929
"build:all": "jlpm run build:lib && jlpm run build:labextension",
3030
"build:labextension": "jupyter labextension build .",
31+
"build:labextension:dev": "jupyter labextension build --development True .",
3132
"build:lib": "tsc",
3233
"clean": "jlpm run clean:lib",
3334
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
@@ -42,18 +43,18 @@
4243
"watch:src": "tsc -w"
4344
},
4445
"dependencies": {
45-
"@jupyterlab/application": "~3.0.0-beta.8",
46-
"@jupyterlab/launcher": "~3.0.0-beta.8",
47-
"@jupyterlab/mainmenu": "~3.0.0-beta.8",
48-
"@jupyterlab/outputarea": "~3.0.0-beta.8",
49-
"@jupyterlab/translation": "^3.0.0-beta.8",
46+
"@jupyterlab/application": "~3.0.0-beta.6",
47+
"@jupyterlab/launcher": "~3.0.0-beta.6",
48+
"@jupyterlab/mainmenu": "~3.0.0-beta.6",
49+
"@jupyterlab/outputarea": "~3.0.0-beta.6",
50+
"@jupyterlab/translation": "~3.0.0-beta.6",
5051
"@lumino/algorithm": "^1.3.3",
5152
"@lumino/coreutils": "^1.5.3",
5253
"@lumino/datagrid": "^0.3.1",
5354
"@lumino/disposable": "^1.4.3"
5455
},
5556
"devDependencies": {
56-
"@jupyterlab/builder": "^3.0.0-beta.4",
57+
"@jupyterlab/builder": "^3.0.0-beta.6",
5758
"@typescript-eslint/eslint-plugin": "^2.27.0",
5859
"@typescript-eslint/parser": "^2.27.0",
5960
"eslint": "^7.5.0",

‎advanced/kernel-output/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"]
2+
requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"]
33
build-backend = "setuptools.build_meta"

‎advanced/kernel-output/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
)
4444

4545
cmdclass["jsdeps"] = combine_commands(
46-
install_npm(HERE, build_cmd="build:all", npm=["jlpm"]),
46+
install_npm(HERE, build_cmd="build", npm=["jlpm"]),
4747
ensure_targets(jstargets),
4848
)
4949

@@ -61,7 +61,7 @@
6161
cmdclass= cmdclass,
6262
packages=setuptools.find_packages(),
6363
install_requires=[
64-
"jupyterlab~=3.0.0b4",
64+
"jupyterlab>=3.0.0b6,==3.*",
6565
],
6666
zip_safe=False,
6767
include_package_data=True,

‎advanced/server-extension/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ cmdclass = create_cmdclass("jsdeps",
541541
)
542542

543543
cmdclass["jsdeps"] = combine_commands(
544-
install_npm(HERE, build_cmd="build:all", npm=["jlpm"]),
544+
install_npm(HERE, build_cmd="build", npm=["jlpm"]),
545545
ensure_targets(jstargets),
546546
)
547547

@@ -559,7 +559,7 @@ setup_args = dict(
559559
cmdclass= cmdclass,
560560
packages=setuptools.find_packages(),
561561
install_requires=[
562-
"jupyterlab~=3.0.0b4",
562+
"jupyterlab>=3.0.0b6,==3.*",
563563
],
564564
zip_safe=False,
565565
include_package_data=True,
@@ -598,7 +598,7 @@ cmdclass = create_cmdclass("jsdeps",
598598
)
599599

600600
cmdclass["jsdeps"] = combine_commands(
601-
install_npm(HERE, build_cmd="build:all", npm=["jlpm"]),
601+
install_npm(HERE, build_cmd="build", npm=["jlpm"]),
602602
ensure_targets(jstargets),
603603
)
604604
```
@@ -608,7 +608,7 @@ Basically it will build the frontend NPM package:
608608
```py
609609
# setup.py#L48-L48
610610

611-
install_npm(HERE, build_cmd="build:all", npm=["jlpm"]),
611+
install_npm(HERE, build_cmd="build", npm=["jlpm"]),
612612
```
613613
614614
It will ensure one of the generated JS files is `lib/jlabextexample.js`:
@@ -665,6 +665,7 @@ file:
665665
```json5
666666
// package.json#L68-L78
667667

668+
],
668669
"jupyterlab": {
669670
"discovery": {
670671
"server": {
@@ -675,25 +676,24 @@ file:
675676
"name": "jlab_ext_example"
676677
}
677678
}
678-
},
679679
```
680680
681681
In this example, the extension requires a `server` extension:
682682
683683
```json5
684684
// package.json#L70-L70
685685

686-
"server": {
686+
"discovery": {
687687
```
688688

689689
And that server extension is available through `pip`:
690690

691691
```json5
692692
// package.json#L71-L73
693693

694-
"managers": [
695-
"pip"
696-
],
694+
"server": {
695+
"managers": [
696+
"pip"
697697
```
698698

699699
For more information on the `discovery` metadata, please refer to the [documentation](https://jupyterlab.readthedocs.io/en/stable/developer/extension_dev.html#ext-author-companion-packages).

‎advanced/server-extension/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
"url": "https://github.com/jupyterlab/extension-examples.git"
2626
},
2727
"scripts": {
28-
"build": "jlpm run build:lib",
28+
"build": "jlpm run build:lib && jlpm run build:labextension",
2929
"build:all": "jlpm run build:lib && jlpm run build:labextension",
3030
"build:labextension": "jupyter labextension build .",
31+
"build:labextension:dev": "jupyter labextension build --development True .",
3132
"build:lib": "tsc",
3233
"clean": "jlpm run clean:lib",
3334
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
@@ -42,13 +43,13 @@
4243
"watch:src": "tsc -w"
4344
},
4445
"dependencies": {
45-
"@jupyterlab/application": "~3.0.0-beta.4",
46-
"@jupyterlab/coreutils": "~5.0.0-beta.4",
47-
"@jupyterlab/launcher": "~3.0.0-beta.4",
48-
"@jupyterlab/services": "~6.0.0-beta.4"
46+
"@jupyterlab/application": "~3.0.0-beta.6",
47+
"@jupyterlab/coreutils": "~5.0.0-beta.6",
48+
"@jupyterlab/launcher": "~3.0.0-beta.6",
49+
"@jupyterlab/services": "~6.0.0-beta.6"
4950
},
5051
"devDependencies": {
51-
"@jupyterlab/builder": "^3.0.0-beta.4",
52+
"@jupyterlab/builder": "^3.0.0-beta.6",
5253
"@typescript-eslint/eslint-plugin": "^2.27.0",
5354
"@typescript-eslint/parser": "^2.27.0",
5455
"eslint": "^7.5.0",

‎advanced/server-extension/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"]
2+
requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"]
33
build-backend = "setuptools.build_meta"

‎advanced/server-extension/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
)
4646

4747
cmdclass["jsdeps"] = combine_commands(
48-
install_npm(HERE, build_cmd="build:all", npm=["jlpm"]),
48+
install_npm(HERE, build_cmd="build", npm=["jlpm"]),
4949
ensure_targets(jstargets),
5050
)
5151

@@ -63,7 +63,7 @@
6363
cmdclass= cmdclass,
6464
packages=setuptools.find_packages(),
6565
install_requires=[
66-
"jupyterlab~=3.0.0b4",
66+
"jupyterlab>=3.0.0b6,==3.*",
6767
],
6868
zip_safe=False,
6969
include_package_data=True,

0 commit comments

Comments
 (0)