Skip to content

Commit

Permalink
Merge pull request #6429 from jtpio/update-lab
Browse files Browse the repository at this point in the history
Update to JupyterLab 4.0.0a25
  • Loading branch information
jtpio authored May 20, 2022
2 parents 6c6bd4b + 417afc5 commit 4bfaaac
Show file tree
Hide file tree
Showing 37 changed files with 2,138 additions and 1,907 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-dist/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
- name: Install dependencies
shell: bash
run: |
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a24,<5" build
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a25,<5" build
- name: Build pypi distributions
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buildutils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.0.0a24,<5" jupyter_packaging~=0.10
python -m pip install -U "jupyterlab>=4.0.0a25,<5" jupyter_packaging~=0.10
jlpm
jlpm run build
Expand Down Expand Up @@ -80,6 +80,6 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.0.0a24,<5" jupyter_packaging~=0.10 pip
python -m pip install -U "jupyterlab>=4.0.0a25,<5" jupyter_packaging~=0.10 pip
jlpm
jlpm run build
12 changes: 10 additions & 2 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ async function main() {
'@jupyterlab/application-extension:commands',
'@jupyterlab/application-extension:context-menu',
'@jupyterlab/application-extension:faviconbusy',
'@jupyterlab/application-extension:top-bar',
'@jupyterlab/application-extension:top-spacer'
].includes(id)
),
Expand Down Expand Up @@ -162,6 +163,7 @@ async function main() {
'@jupyterlab/filebrowser-extension:download',
'@jupyterlab/filebrowser-extension:file-upload-status',
'@jupyterlab/filebrowser-extension:open-with',
'@jupyterlab/filebrowser-extension:search',
'@jupyterlab/filebrowser-extension:share-file'
].includes(id)
),
Expand All @@ -174,7 +176,10 @@ async function main() {
baseMods = baseMods.concat([
require('@jupyterlab/cell-toolbar-extension'),
require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
['@jupyterlab/notebook-extension:completer'].includes(id)
[
'@jupyterlab/notebook-extension:completer',
'@jupyterlab/notebook-extension:search'
].includes(id)
),
require('@jupyterlab/tooltip-extension').default.filter(({ id }) =>
[
Expand Down Expand Up @@ -202,7 +207,10 @@ async function main() {
['@jupyterlab/codemirror-extension:commands'].includes(id)
),
require('@jupyterlab/fileeditor-extension').default.filter(({ id }) =>
['@jupyterlab/fileeditor-extension:completer'].includes(id)
[
'@jupyterlab/fileeditor-extension:completer',
'@jupyterlab/fileeditor-extension:search'
].includes(id)
),
require('@jupyterlab/filebrowser-extension').default.filter(({ id }) =>
['@jupyterlab/filebrowser-extension:browser'].includes(id)
Expand Down
188 changes: 94 additions & 94 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,66 +21,66 @@
"@jupyter-notebook/terminal-extension": "~7.0.0-alpha.3",
"@jupyter-notebook/tree-extension": "~7.0.0-alpha.3",
"@jupyter-notebook/ui-components": "~7.0.0-alpha.3",
"@jupyterlab/application": "~4.0.0-alpha.9",
"@jupyterlab/application-extension": "~4.0.0-alpha.9",
"@jupyterlab/apputils": "~4.0.0-alpha.9",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.9",
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.7",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.7",
"@jupyterlab/celltags": "~4.0.0-alpha.9",
"@jupyterlab/codeeditor": "~4.0.0-alpha.9",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.9",
"@jupyterlab/completer": "~4.0.0-alpha.9",
"@jupyterlab/completer-extension": "~4.0.0-alpha.9",
"@jupyterlab/console": "~4.0.0-alpha.9",
"@jupyterlab/console-extension": "~4.0.0-alpha.9",
"@jupyterlab/coreutils": "~6.0.0-alpha.9",
"@jupyterlab/docmanager": "~4.0.0-alpha.9",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.9",
"@jupyterlab/docprovider": "~4.0.0-alpha.9",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.9",
"@jupyterlab/documentsearch": "~4.0.0-alpha.9",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.9",
"@jupyterlab/filebrowser": "~4.0.0-alpha.9",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.9",
"@jupyterlab/fileeditor": "~4.0.0-alpha.9",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.9",
"@jupyterlab/hub-extension": "~4.0.0-alpha.9",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.9",
"@jupyterlab/json-extension": "~4.0.0-alpha.9",
"@jupyterlab/mainmenu": "~4.0.0-alpha.9",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.9",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.9",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.9",
"@jupyterlab/notebook": "~4.0.0-alpha.9",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.9",
"@jupyterlab/observables": "~5.0.0-alpha.9",
"@jupyterlab/outputarea": "~4.0.0-alpha.9",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.9",
"@jupyterlab/rendermime": "~4.0.0-alpha.9",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.9",
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.9",
"@jupyterlab/running-extension": "~4.0.0-alpha.9",
"@jupyterlab/services": "~7.0.0-alpha.9",
"@jupyterlab/settingregistry": "~4.0.0-alpha.9",
"@jupyterlab/shared-models": "~4.0.0-alpha.9",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.9",
"@jupyterlab/statedb": "~4.0.0-alpha.9",
"@jupyterlab/statusbar": "~4.0.0-alpha.9",
"@jupyterlab/terminal": "~4.0.0-alpha.9",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.9",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.9",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.9",
"@jupyterlab/tooltip": "~4.0.0-alpha.9",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.9",
"@jupyterlab/translation": "~4.0.0-alpha.9",
"@jupyterlab/translation-extension": "~4.0.0-alpha.9",
"@jupyterlab/ui-components": "~4.0.0-alpha.24",
"@jupyterlab/user": "~4.0.0-alpha.9",
"@jupyterlab/user-extension": "~4.0.0-alpha.9",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.9",
"@jupyterlab/application": "~4.0.0-alpha.10",
"@jupyterlab/application-extension": "~4.0.0-alpha.10",
"@jupyterlab/apputils": "~4.0.0-alpha.10",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.10",
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.10",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.10",
"@jupyterlab/celltags": "~4.0.0-alpha.10",
"@jupyterlab/codeeditor": "~4.0.0-alpha.10",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.10",
"@jupyterlab/completer": "~4.0.0-alpha.10",
"@jupyterlab/completer-extension": "~4.0.0-alpha.10",
"@jupyterlab/console": "~4.0.0-alpha.10",
"@jupyterlab/console-extension": "~4.0.0-alpha.10",
"@jupyterlab/coreutils": "~6.0.0-alpha.10",
"@jupyterlab/docmanager": "~4.0.0-alpha.10",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.10",
"@jupyterlab/docprovider": "~4.0.0-alpha.10",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.10",
"@jupyterlab/documentsearch": "~4.0.0-alpha.10",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.10",
"@jupyterlab/filebrowser": "~4.0.0-alpha.10",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.10",
"@jupyterlab/fileeditor": "~4.0.0-alpha.10",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.10",
"@jupyterlab/hub-extension": "~4.0.0-alpha.10",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.10",
"@jupyterlab/json-extension": "~4.0.0-alpha.10",
"@jupyterlab/mainmenu": "~4.0.0-alpha.10",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.10",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.10",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.10",
"@jupyterlab/notebook": "~4.0.0-alpha.10",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.10",
"@jupyterlab/observables": "~5.0.0-alpha.10",
"@jupyterlab/outputarea": "~4.0.0-alpha.10",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.10",
"@jupyterlab/rendermime": "~4.0.0-alpha.10",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.10",
"@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.10",
"@jupyterlab/running-extension": "~4.0.0-alpha.10",
"@jupyterlab/services": "~7.0.0-alpha.10",
"@jupyterlab/settingregistry": "~4.0.0-alpha.10",
"@jupyterlab/shared-models": "~4.0.0-alpha.10",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.10",
"@jupyterlab/statedb": "~4.0.0-alpha.10",
"@jupyterlab/statusbar": "~4.0.0-alpha.10",
"@jupyterlab/terminal": "~4.0.0-alpha.10",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.10",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.10",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.10",
"@jupyterlab/tooltip": "~4.0.0-alpha.10",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.10",
"@jupyterlab/translation": "~4.0.0-alpha.10",
"@jupyterlab/translation-extension": "~4.0.0-alpha.10",
"@jupyterlab/ui-components": "~4.0.0-alpha.25",
"@jupyterlab/user": "~4.0.0-alpha.10",
"@jupyterlab/user-extension": "~4.0.0-alpha.10",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.10",
"@lumino/algorithm": "~1.9.1",
"@lumino/application": "~1.28.1",
"@lumino/application": "~1.29.0",
"@lumino/commands": "~1.20.0",
"@lumino/coreutils": "~1.12.0",
"@lumino/disposable": "~1.10.1",
Expand All @@ -90,10 +90,10 @@
"@lumino/properties": "~1.8.1",
"@lumino/signaling": "~1.10.1",
"@lumino/virtualdom": "~1.14.1",
"@lumino/widgets": "~1.31.1",
"@lumino/widgets": "~1.32.0",
"react": "~17.0.2",
"react-dom": "~17.0.2",
"yjs": "~13.5.28"
"yjs": "~13.5.38"
},
"dependencies": {
"@jupyter-notebook/application": "^7.0.0-alpha.3",
Expand All @@ -106,41 +106,41 @@
"@jupyter-notebook/terminal-extension": "^7.0.0-alpha.3",
"@jupyter-notebook/tree-extension": "^7.0.0-alpha.3",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.3",
"@jupyterlab/application-extension": "^4.0.0-alpha.9",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.9",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.7",
"@jupyterlab/celltags": "^4.0.0-alpha.9",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.9",
"@jupyterlab/completer-extension": "^4.0.0-alpha.9",
"@jupyterlab/console-extension": "^4.0.0-alpha.9",
"@jupyterlab/coreutils": "~6.0.0-alpha.9",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.9",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.9",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.9",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.9",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.9",
"@jupyterlab/hub-extension": "^4.0.0-alpha.9",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.9",
"@jupyterlab/json-extension": "^4.0.0-alpha.9",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.9",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.9",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.9",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.9",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.9",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.9",
"@jupyterlab/running-extension": "^4.0.0-alpha.9",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.9",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.9",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.9",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.9",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.9",
"@jupyterlab/translation-extension": "^4.0.0-alpha.9",
"@jupyterlab/user-extension": "^4.0.0-alpha.9",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.9"
"@jupyterlab/application-extension": "^4.0.0-alpha.10",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.10",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.10",
"@jupyterlab/celltags": "^4.0.0-alpha.10",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.10",
"@jupyterlab/completer-extension": "^4.0.0-alpha.10",
"@jupyterlab/console-extension": "^4.0.0-alpha.10",
"@jupyterlab/coreutils": "~6.0.0-alpha.10",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.10",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.10",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.10",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.10",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.10",
"@jupyterlab/hub-extension": "^4.0.0-alpha.10",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.10",
"@jupyterlab/json-extension": "^4.0.0-alpha.10",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.10",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.10",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.10",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.10",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.10",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.10",
"@jupyterlab/running-extension": "^4.0.0-alpha.10",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.10",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.10",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.10",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.10",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.10",
"@jupyterlab/translation-extension": "^4.0.0-alpha.10",
"@jupyterlab/user-extension": "^4.0.0-alpha.10",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.10"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-alpha.9",
"@jupyterlab/buildutils": "^4.0.0-alpha.9",
"@jupyterlab/builder": "^4.0.0-alpha.10",
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"fs-extra": "^8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion buildutils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "^4.0.0-alpha.9",
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.6.3"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"watch:lib": "lerna exec --stream --scope @jupyter-notebook/metapackage jlpm watch"
},
"devDependencies": {
"@jupyterlab/buildutils": "^4.0.0-alpha.9",
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",
Expand Down
26 changes: 13 additions & 13 deletions packages/application-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
"dependencies": {
"@jupyter-notebook/application": "^7.0.0-alpha.3",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.3",
"@jupyterlab/application": "^4.0.0-alpha.9",
"@jupyterlab/apputils": "^4.0.0-alpha.9",
"@jupyterlab/celltags": "^4.0.0-alpha.9",
"@jupyterlab/codeeditor": "^4.0.0-alpha.9",
"@jupyterlab/codemirror": "^4.0.0-alpha.9",
"@jupyterlab/console": "^4.0.0-alpha.9",
"@jupyterlab/coreutils": "^6.0.0-alpha.9",
"@jupyterlab/docmanager": "^4.0.0-alpha.9",
"@jupyterlab/docregistry": "^4.0.0-alpha.9",
"@jupyterlab/mainmenu": "^4.0.0-alpha.9",
"@jupyterlab/settingregistry": "^4.0.0-alpha.9",
"@jupyterlab/translation": "^4.0.0-alpha.9",
"@jupyterlab/application": "^4.0.0-alpha.10",
"@jupyterlab/apputils": "^4.0.0-alpha.10",
"@jupyterlab/celltags": "^4.0.0-alpha.10",
"@jupyterlab/codeeditor": "^4.0.0-alpha.10",
"@jupyterlab/codemirror": "^4.0.0-alpha.10",
"@jupyterlab/console": "^4.0.0-alpha.10",
"@jupyterlab/coreutils": "^6.0.0-alpha.10",
"@jupyterlab/docmanager": "^4.0.0-alpha.10",
"@jupyterlab/docregistry": "^4.0.0-alpha.10",
"@jupyterlab/mainmenu": "^4.0.0-alpha.10",
"@jupyterlab/settingregistry": "^4.0.0-alpha.10",
"@jupyterlab/translation": "^4.0.0-alpha.10",
"@lumino/coreutils": "^1.12.0",
"@lumino/disposable": "^1.10.1",
"@lumino/widgets": "^1.31.1"
"@lumino/widgets": "^1.32.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
10 changes: 10 additions & 0 deletions packages/application-extension/schema/title.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"title": "Title widget",
"description": "Title widget",
"jupyter.lab.toolbars": {
"TopBar": [{ "name": "widgetTitle", "rank": 10 }]
},
"properties": {},
"additionalProperties": false,
"type": "object"
}
Loading

0 comments on commit 4bfaaac

Please sign in to comment.