Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

Update to JupyterLab 4.0 alpha #319

Merged
merged 19 commits into from
Jan 21, 2022
Merged

Update to JupyterLab 4.0 alpha #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2cf6ac3
Update to JupyterLab 4.0 alpha
jtpio Jan 5, 2022
b1aeaa2
Drop Python 3.6
jtpio Jan 5, 2022
1cbaa4f
Rotate Python versions on CI
jtpio Jan 5, 2022
6af3af2
Update matrix entry to 3.10
jtpio Jan 6, 2022
5f25099
Switch steps on Binder
jtpio Jan 6, 2022
6d78f87
Update to alpha 19
jtpio Jan 19, 2022
225bfd5
Include `@jupyterlab/user-extension`
jtpio Jan 19, 2022
207e4b5
Include `@jupyter/apputils-extension:toolbar-registry`
jtpio Jan 19, 2022
653307f
Update spacer to match upstream rank
jtpio Jan 19, 2022
f07c26a
Do not default to collaborative by default for now
jtpio Jan 19, 2022
280f623
Don't close terminal on exit (#4)
davidbrochart Jan 20, 2022
fcab58c
Integrity
jtpio Jan 20, 2022
4eca86c
Wait for settings before opening the notebook
jtpio Jan 20, 2022
69452f9
Update reference snapshots (font changed)
jtpio Jan 20, 2022
3a9278b
Update to the latest galata
jtpio Jan 20, 2022
8b60f21
Update selector for run and advance
jtpio Jan 20, 2022
68748a8
Update smoke test
jtpio Jan 20, 2022
ba093aa
Re-enable RTC on Binder
jtpio Jan 20, 2022
5bcfa90
Shut down kernels
jtpio Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu, macos, windows]
python: ['3.6', '3.9']
python: ['3.7', '3.10']
include:
- python: '3.6'
- python: '3.7'
dist: 'retrolab*.tar.gz'
- python: '3.9'
- python: '3.10'
dist: 'retrolab*.whl'
- os: windows
py_cmd: python
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buildutils.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U jupyterlab~=3.0 jupyter_packaging~=0.10
python -m pip install -U "jupyterlab>=4.0.0a18,<5" jupyter_packaging~=0.10
jlpm
jlpm run build

Expand Down Expand Up @@ -75,6 +75,6 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U jupyterlab~=3.0 jupyter_packaging~=0.10 pip
python -m pip install -U "jupyterlab>=4.0.0a18,<5" jupyter_packaging~=0.10 pip
jlpm
jlpm run build
5 changes: 4 additions & 1 deletion app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ async function main() {
'@jupyterlab/apputils-extension:settings',
'@jupyterlab/apputils-extension:state',
'@jupyterlab/apputils-extension:themes',
'@jupyterlab/apputils-extension:themes-palette-menu'
'@jupyterlab/apputils-extension:themes-palette-menu',
// TODO: rename to @jupyterlab/ when fixed and released upstream
'@jupyter/apputils-extension:toolbar-registry'
].includes(id)
),
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
Expand Down Expand Up @@ -131,6 +133,7 @@ async function main() {
require('@jupyterlab/theme-dark-extension'),
require('@jupyterlab/translation-extension'),
// Add the "Hub Control Panel" menu option when running in JupyterHub
require('@jupyterlab/user-extension'),
require('@jupyterlab/hub-extension')
];

Expand Down
217 changes: 111 additions & 106 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,71 +11,73 @@
"watch": "webpack --config ./webpack.config.watch.js"
},
"resolutions": {
"@jupyterlab/application": "~3.2.6",
"@jupyterlab/application-extension": "~3.2.6",
"@jupyterlab/apputils": "~3.2.6",
"@jupyterlab/apputils-extension": "~3.2.6",
"@jupyterlab/celltags": "~3.2.6",
"@jupyterlab/codeeditor": "~3.2.6",
"@jupyterlab/codemirror-extension": "~3.2.6",
"@jupyterlab/completer": "~3.2.6",
"@jupyterlab/completer-extension": "~3.2.6",
"@jupyterlab/console": "~3.2.6",
"@jupyterlab/console-extension": "~3.2.6",
"@jupyterlab/coreutils": "~5.2.6",
"@jupyterlab/docmanager": "~3.2.6",
"@jupyterlab/docmanager-extension": "~3.2.6",
"@jupyterlab/docprovider": "~3.2.6",
"@jupyterlab/docprovider-extension": "~3.2.6",
"@jupyterlab/documentsearch": "~3.2.6",
"@jupyterlab/documentsearch-extension": "~3.2.6",
"@jupyterlab/filebrowser": "~3.2.6",
"@jupyterlab/filebrowser-extension": "~3.2.6",
"@jupyterlab/fileeditor": "~3.2.6",
"@jupyterlab/fileeditor-extension": "~3.2.6",
"@jupyterlab/hub-extension": "~3.2.6",
"@jupyterlab/javascript-extension": "~3.2.6",
"@jupyterlab/json-extension": "~3.2.6",
"@jupyterlab/mainmenu": "~3.2.6",
"@jupyterlab/mainmenu-extension": "~3.2.6",
"@jupyterlab/mathjax2-extension": "~3.2.6",
"@jupyterlab/notebook": "~3.2.6",
"@jupyterlab/notebook-extension": "~3.2.6",
"@jupyterlab/observables": "~4.2.6",
"@jupyterlab/outputarea": "~3.2.6",
"@jupyterlab/pdf-extension": "~3.2.6",
"@jupyterlab/rendermime": "~3.2.6",
"@jupyterlab/rendermime-extension": "~3.2.6",
"@jupyterlab/rendermime-interfaces": "~3.2.6",
"@jupyterlab/running-extension": "~3.2.6",
"@jupyterlab/services": "~6.2.6",
"@jupyterlab/settingregistry": "~3.2.6",
"@jupyterlab/shared-models": "~3.2.6",
"@jupyterlab/shortcuts-extension": "~3.2.6",
"@jupyterlab/statedb": "~3.2.6",
"@jupyterlab/statusbar": "~3.2.6",
"@jupyterlab/terminal": "~3.2.6",
"@jupyterlab/terminal-extension": "~3.2.6",
"@jupyterlab/theme-dark-extension": "~3.2.6",
"@jupyterlab/theme-light-extension": "~3.2.6",
"@jupyterlab/tooltip": "~3.2.6",
"@jupyterlab/tooltip-extension": "~3.2.6",
"@jupyterlab/translation": "~3.2.6",
"@jupyterlab/translation-extension": "~3.2.6",
"@jupyterlab/ui-components": "~3.2.6",
"@jupyterlab/vega5-extension": "~3.2.6",
"@lumino/algorithm": "~1.6.0",
"@lumino/application": "~1.20.0",
"@lumino/commands": "~1.15.0",
"@lumino/coreutils": "~1.8.0",
"@lumino/disposable": "~1.7.0",
"@lumino/domutils": "~1.5.0",
"@lumino/dragdrop": "~1.10.0",
"@lumino/messaging": "~1.7.0",
"@lumino/properties": "~1.5.0",
"@lumino/signaling": "~1.7.0",
"@lumino/virtualdom": "~1.11.0",
"@lumino/widgets": "~1.23.0",
"@jupyterlab/application": "~4.0.0-alpha.4",
"@jupyterlab/application-extension": "~4.0.0-alpha.4",
"@jupyterlab/apputils": "~4.0.0-alpha.4",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.4",
"@jupyterlab/celltags": "~4.0.0-alpha.4",
"@jupyterlab/codeeditor": "~4.0.0-alpha.4",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.4",
"@jupyterlab/completer": "~4.0.0-alpha.4",
"@jupyterlab/completer-extension": "~4.0.0-alpha.4",
"@jupyterlab/console": "~4.0.0-alpha.4",
"@jupyterlab/console-extension": "~4.0.0-alpha.4",
"@jupyterlab/coreutils": "~6.0.0-alpha.4",
"@jupyterlab/docmanager": "~4.0.0-alpha.4",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.4",
"@jupyterlab/docprovider": "~4.0.0-alpha.4",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.4",
"@jupyterlab/documentsearch": "~4.0.0-alpha.4",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.4",
"@jupyterlab/filebrowser": "~4.0.0-alpha.4",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.4",
"@jupyterlab/fileeditor": "~4.0.0-alpha.4",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.4",
"@jupyterlab/hub-extension": "~4.0.0-alpha.4",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.4",
"@jupyterlab/json-extension": "~4.0.0-alpha.4",
"@jupyterlab/mainmenu": "~4.0.0-alpha.4",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.4",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.4",
"@jupyterlab/notebook": "~4.0.0-alpha.4",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.4",
"@jupyterlab/observables": "~5.0.0-alpha.4",
"@jupyterlab/outputarea": "~4.0.0-alpha.4",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.4",
"@jupyterlab/rendermime": "~4.0.0-alpha.4",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.4",
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.4",
"@jupyterlab/running-extension": "~4.0.0-alpha.4",
"@jupyterlab/services": "~7.0.0-alpha.4",
"@jupyterlab/settingregistry": "~4.0.0-alpha.4",
"@jupyterlab/shared-models": "~4.0.0-alpha.4",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.4",
"@jupyterlab/statedb": "~4.0.0-alpha.4",
"@jupyterlab/statusbar": "~4.0.0-alpha.4",
"@jupyterlab/terminal": "~4.0.0-alpha.4",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.4",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.4",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.4",
"@jupyterlab/tooltip": "~4.0.0-alpha.4",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.4",
"@jupyterlab/translation": "~4.0.0-alpha.4",
"@jupyterlab/translation-extension": "~4.0.0-alpha.4",
"@jupyterlab/ui-components": "~4.0.0-alpha.19",
"@jupyterlab/user": "~4.0.0-alpha.4",
"@jupyterlab/user-extension": "~4.0.0-alpha.4",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.4",
"@lumino/algorithm": "~1.9.1",
"@lumino/application": "~1.27.1",
"@lumino/commands": "~1.19.1",
"@lumino/coreutils": "~1.11.1",
"@lumino/disposable": "~1.10.1",
"@lumino/domutils": "~1.8.1",
"@lumino/dragdrop": "~1.13.1",
"@lumino/messaging": "~1.10.1",
"@lumino/properties": "~1.8.1",
"@lumino/signaling": "~1.10.1",
"@lumino/virtualdom": "~1.14.1",
"@lumino/widgets": "~1.30.1",
"@retrolab/application": "~0.3.16",
"@retrolab/application-extension": "~0.3.16",
"@retrolab/console-extension": "~0.3.16",
Expand All @@ -91,48 +93,49 @@
"yjs": "~13.5.23"
},
"dependencies": {
"@jupyterlab/application-extension": "^3.2.6",
"@jupyterlab/apputils-extension": "^3.2.6",
"@jupyterlab/celltags": "^3.2.6",
"@jupyterlab/codemirror-extension": "^3.2.6",
"@jupyterlab/completer-extension": "^3.2.6",
"@jupyterlab/console-extension": "^3.2.6",
"@jupyterlab/coreutils": "~5.2.6",
"@jupyterlab/docmanager-extension": "^3.2.6",
"@jupyterlab/docprovider-extension": "^3.2.6",
"@jupyterlab/documentsearch-extension": "^3.2.6",
"@jupyterlab/filebrowser-extension": "^3.2.6",
"@jupyterlab/fileeditor-extension": "^3.2.6",
"@jupyterlab/hub-extension": "^3.2.6",
"@jupyterlab/javascript-extension": "^3.2.6",
"@jupyterlab/json-extension": "^3.2.6",
"@jupyterlab/mainmenu-extension": "^3.2.6",
"@jupyterlab/mathjax2-extension": "^3.2.6",
"@jupyterlab/notebook-extension": "^3.2.6",
"@jupyterlab/pdf-extension": "^3.2.6",
"@jupyterlab/rendermime-extension": "^3.2.6",
"@jupyterlab/running-extension": "^3.2.6",
"@jupyterlab/shortcuts-extension": "^3.2.6",
"@jupyterlab/terminal-extension": "^3.2.6",
"@jupyterlab/theme-dark-extension": "^3.2.6",
"@jupyterlab/theme-light-extension": "^3.2.6",
"@jupyterlab/tooltip-extension": "^3.2.6",
"@jupyterlab/translation-extension": "^3.2.6",
"@jupyterlab/vega5-extension": "^3.2.6",
"@retrolab/application": "^0.3.16",
"@retrolab/application-extension": "^0.3.16",
"@retrolab/console-extension": "^0.3.16",
"@retrolab/docmanager-extension": "^0.3.16",
"@retrolab/documentsearch-extension": "^0.3.16",
"@retrolab/help-extension": "^0.3.16",
"@retrolab/notebook-extension": "^0.3.16",
"@retrolab/terminal-extension": "^0.3.16",
"@retrolab/tree-extension": "^0.3.16",
"@retrolab/ui-components": "^0.3.16"
"@jupyterlab/application-extension": "^4.0.0-alpha.4",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.4",
"@jupyterlab/celltags": "^4.0.0-alpha.4",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.4",
"@jupyterlab/completer-extension": "^4.0.0-alpha.4",
"@jupyterlab/console-extension": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "~6.0.0-alpha.4",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.4",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.4",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.4",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.4",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.4",
"@jupyterlab/hub-extension": "^4.0.0-alpha.4",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.4",
"@jupyterlab/json-extension": "^4.0.0-alpha.4",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.4",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.4",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.4",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.4",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.4",
"@jupyterlab/running-extension": "^4.0.0-alpha.4",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.4",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.4",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.4",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.4",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.4",
"@jupyterlab/translation-extension": "^4.0.0-alpha.4",
"@jupyterlab/user-extension": "^4.0.0-alpha.4",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.4",
"@retrolab/application": "^0.3.15",
"@retrolab/application-extension": "^0.3.15",
"@retrolab/console-extension": "^0.3.15",
"@retrolab/docmanager-extension": "^0.3.15",
"@retrolab/documentsearch-extension": "^0.3.15",
"@retrolab/help-extension": "^0.3.15",
"@retrolab/notebook-extension": "^0.3.15",
"@retrolab/terminal-extension": "^0.3.15",
"@retrolab/tree-extension": "^0.3.15",
"@retrolab/ui-components": "^0.3.15"
},
"devDependencies": {
"@jupyterlab/builder": "^3.2.6",
"@jupyterlab/buildutils": "^3.2.6",
"@jupyterlab/builder": "^4.0.0-alpha.4",
"@jupyterlab/buildutils": "^4.0.0-alpha.4",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"file-loader": "~5.0.2",
Expand Down Expand Up @@ -183,7 +186,8 @@
"@jupyterlab/theme-dark-extension",
"@jupyterlab/theme-light-extension",
"@jupyterlab/tooltip-extension",
"@jupyterlab/translation-extension"
"@jupyterlab/translation-extension",
"@jupyterlab/user-extension"
],
"singletonPackages": [
"@jupyterlab/application",
Expand Down Expand Up @@ -212,6 +216,7 @@
"@jupyterlab/terminal",
"@jupyterlab/tooltip",
"@jupyterlab/translation",
"@jupyterlab/user",
"@jupyterlab/ui-components",
"@lumino/algorithm",
"@lumino/application",
Expand Down
2 changes: 1 addition & 1 deletion binder/postBuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
set -euo pipefail

jlpm && jlpm run build
python -m pip install -e .
jlpm && jlpm run build
jlpm run develop
jupyter server extension enable retrolab
jupyter serverextension enable retrolab
2 changes: 1 addition & 1 deletion buildutils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "^3.2.6",
"@jupyterlab/buildutils": "^4.0.0-alpha.4",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.1.3"
Expand Down
2 changes: 1 addition & 1 deletion jupyter_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"RetroApp": { "collaborative": true },
"RetroApp": { "collaborative": true, "expose_app_in_browser": true },
"LabApp": { "collaborative": true, "expose_app_in_browser": true }
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}
},
"devDependencies": {
"@jupyterlab/buildutils": "^3.2.6",
"@jupyterlab/buildutils": "^4.0.0-alpha.4",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",
Expand Down
34 changes: 17 additions & 17 deletions packages/application-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,23 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^3.2.6",
"@jupyterlab/apputils": "^3.2.6",
"@jupyterlab/celltags": "^3.2.6",
"@jupyterlab/codeeditor": "^3.2.6",
"@jupyterlab/codemirror": "^3.2.6",
"@jupyterlab/console": "^3.2.6",
"@jupyterlab/coreutils": "^5.2.6",
"@jupyterlab/docmanager": "^3.2.6",
"@jupyterlab/docregistry": "^3.2.6",
"@jupyterlab/mainmenu": "^3.2.6",
"@jupyterlab/settingregistry": "^3.2.6",
"@jupyterlab/translation": "^3.2.6",
"@lumino/coreutils": "^1.8.0",
"@lumino/disposable": "^1.7.0",
"@lumino/widgets": "^1.23.0",
"@retrolab/application": "^0.3.16",
"@retrolab/ui-components": "^0.3.16"
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/apputils": "^4.0.0-alpha.4",
"@jupyterlab/celltags": "^4.0.0-alpha.4",
"@jupyterlab/codeeditor": "^4.0.0-alpha.4",
"@jupyterlab/codemirror": "^4.0.0-alpha.4",
"@jupyterlab/console": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/docmanager": "^4.0.0-alpha.4",
"@jupyterlab/docregistry": "^4.0.0-alpha.4",
"@jupyterlab/mainmenu": "^4.0.0-alpha.4",
"@jupyterlab/settingregistry": "^4.0.0-alpha.4",
"@jupyterlab/translation": "^4.0.0-alpha.4",
"@lumino/coreutils": "^1.11.1",
"@lumino/disposable": "^1.10.1",
"@lumino/widgets": "^1.30.1",
"@retrolab/application": "^0.3.15",
"@retrolab/ui-components": "^0.3.15"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
Loading