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

Commit

Permalink
Update to JupyterLab 3.3.0 (#351)
Browse files Browse the repository at this point in the history
* Update to JupyterLab 3.3.0rc0

* Update pyproject.toml

* Drop Python 3.6

* Add missing toolbar registry plugin

* Update some ref snapshots

* Add toolbar settings workaround

* Fix UI tests run click

* More run and advance fixes in ui tests

* Fix page reference in ui tests

* Use JupyterLab toolbar registry

* Align toolbar item

* Update reference snapshots

* Revert "Add toolbar settings workaround"

This reverts commit dd750da.

* Add copyright header

* Update to 3.3.0 packages

* Update to jupyterlab~=3.3.0
  • Loading branch information
jtpio authored Mar 3, 2022
1 parent 67aeb8b commit c15e26b
Show file tree
Hide file tree
Showing 34 changed files with 1,086 additions and 944 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
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
3 changes: 2 additions & 1 deletion app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ 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',
'@jupyterlab/apputils-extension:toolbar-registry'
].includes(id)
),
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
Expand Down
166 changes: 83 additions & 83 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,59 +11,59 @@
"watch": "webpack --config ./webpack.config.watch.js"
},
"resolutions": {
"@jupyterlab/application": "~3.2.9",
"@jupyterlab/application-extension": "~3.2.9",
"@jupyterlab/apputils": "~3.2.9",
"@jupyterlab/apputils-extension": "~3.2.9",
"@jupyterlab/celltags": "~3.2.9",
"@jupyterlab/codeeditor": "~3.2.9",
"@jupyterlab/codemirror-extension": "~3.2.9",
"@jupyterlab/completer": "~3.2.9",
"@jupyterlab/completer-extension": "~3.2.9",
"@jupyterlab/console": "~3.2.9",
"@jupyterlab/console-extension": "~3.2.9",
"@jupyterlab/coreutils": "~5.2.9",
"@jupyterlab/docmanager": "~3.2.9",
"@jupyterlab/docmanager-extension": "~3.2.9",
"@jupyterlab/docprovider": "~3.2.9",
"@jupyterlab/docprovider-extension": "~3.2.9",
"@jupyterlab/documentsearch": "~3.2.9",
"@jupyterlab/documentsearch-extension": "~3.2.9",
"@jupyterlab/filebrowser": "~3.2.9",
"@jupyterlab/filebrowser-extension": "~3.2.9",
"@jupyterlab/fileeditor": "~3.2.9",
"@jupyterlab/fileeditor-extension": "~3.2.9",
"@jupyterlab/hub-extension": "~3.2.9",
"@jupyterlab/javascript-extension": "~3.2.9",
"@jupyterlab/json-extension": "~3.2.9",
"@jupyterlab/mainmenu": "~3.2.9",
"@jupyterlab/mainmenu-extension": "~3.2.9",
"@jupyterlab/mathjax2-extension": "~3.2.9",
"@jupyterlab/notebook": "~3.2.9",
"@jupyterlab/notebook-extension": "~3.2.9",
"@jupyterlab/observables": "~4.2.9",
"@jupyterlab/outputarea": "~3.2.9",
"@jupyterlab/pdf-extension": "~3.2.9",
"@jupyterlab/rendermime": "~3.2.9",
"@jupyterlab/rendermime-extension": "~3.2.9",
"@jupyterlab/rendermime-interfaces": "~3.2.9",
"@jupyterlab/running-extension": "~3.2.9",
"@jupyterlab/services": "~6.2.9",
"@jupyterlab/settingregistry": "~3.2.9",
"@jupyterlab/shared-models": "~3.2.9",
"@jupyterlab/shortcuts-extension": "~3.2.9",
"@jupyterlab/statedb": "~3.2.9",
"@jupyterlab/statusbar": "~3.2.9",
"@jupyterlab/terminal": "~3.2.9",
"@jupyterlab/terminal-extension": "~3.2.9",
"@jupyterlab/theme-dark-extension": "~3.2.9",
"@jupyterlab/theme-light-extension": "~3.2.9",
"@jupyterlab/tooltip": "~3.2.9",
"@jupyterlab/tooltip-extension": "~3.2.9",
"@jupyterlab/translation": "~3.2.9",
"@jupyterlab/translation-extension": "~3.2.9",
"@jupyterlab/ui-components": "~3.2.9",
"@jupyterlab/vega5-extension": "~3.2.9",
"@jupyterlab/application": "~3.3.0",
"@jupyterlab/application-extension": "~3.3.0",
"@jupyterlab/apputils": "~3.3.0",
"@jupyterlab/apputils-extension": "~3.3.0",
"@jupyterlab/celltags": "~3.3.0",
"@jupyterlab/codeeditor": "~3.3.0",
"@jupyterlab/codemirror-extension": "~3.3.0",
"@jupyterlab/completer": "~3.3.0",
"@jupyterlab/completer-extension": "~3.3.0",
"@jupyterlab/console": "~3.3.0",
"@jupyterlab/console-extension": "~3.3.0",
"@jupyterlab/coreutils": "~5.3.0",
"@jupyterlab/docmanager": "~3.3.0",
"@jupyterlab/docmanager-extension": "~3.3.0",
"@jupyterlab/docprovider": "~3.3.0",
"@jupyterlab/docprovider-extension": "~3.3.0",
"@jupyterlab/documentsearch": "~3.3.0",
"@jupyterlab/documentsearch-extension": "~3.3.0",
"@jupyterlab/filebrowser": "~3.3.0",
"@jupyterlab/filebrowser-extension": "~3.3.0",
"@jupyterlab/fileeditor": "~3.3.0",
"@jupyterlab/fileeditor-extension": "~3.3.0",
"@jupyterlab/hub-extension": "~3.3.0",
"@jupyterlab/javascript-extension": "~3.3.0",
"@jupyterlab/json-extension": "~3.3.0",
"@jupyterlab/mainmenu": "~3.3.0",
"@jupyterlab/mainmenu-extension": "~3.3.0",
"@jupyterlab/mathjax2-extension": "~3.3.0",
"@jupyterlab/notebook": "~3.3.0",
"@jupyterlab/notebook-extension": "~3.3.0",
"@jupyterlab/observables": "~4.3.0",
"@jupyterlab/outputarea": "~3.3.0",
"@jupyterlab/pdf-extension": "~3.3.0",
"@jupyterlab/rendermime": "~3.3.0",
"@jupyterlab/rendermime-extension": "~3.3.0",
"@jupyterlab/rendermime-interfaces": "~3.3.0",
"@jupyterlab/running-extension": "~3.3.0",
"@jupyterlab/services": "~6.3.0",
"@jupyterlab/settingregistry": "~3.3.0",
"@jupyterlab/shared-models": "~3.3.0",
"@jupyterlab/shortcuts-extension": "~3.3.0",
"@jupyterlab/statedb": "~3.3.0",
"@jupyterlab/statusbar": "~3.3.0",
"@jupyterlab/terminal": "~3.3.0",
"@jupyterlab/terminal-extension": "~3.3.0",
"@jupyterlab/theme-dark-extension": "~3.3.0",
"@jupyterlab/theme-light-extension": "~3.3.0",
"@jupyterlab/tooltip": "~3.3.0",
"@jupyterlab/tooltip-extension": "~3.3.0",
"@jupyterlab/translation": "~3.3.0",
"@jupyterlab/translation-extension": "~3.3.0",
"@jupyterlab/ui-components": "~3.3.0",
"@jupyterlab/vega5-extension": "~3.3.0",
"@lumino/algorithm": "~1.6.0",
"@lumino/application": "~1.20.0",
"@lumino/commands": "~1.15.0",
Expand Down Expand Up @@ -91,34 +91,34 @@
"yjs": "~13.5.23"
},
"dependencies": {
"@jupyterlab/application-extension": "^3.2.9",
"@jupyterlab/apputils-extension": "^3.2.9",
"@jupyterlab/celltags": "^3.2.9",
"@jupyterlab/codemirror-extension": "^3.2.9",
"@jupyterlab/completer-extension": "^3.2.9",
"@jupyterlab/console-extension": "^3.2.9",
"@jupyterlab/coreutils": "~5.2.9",
"@jupyterlab/docmanager-extension": "^3.2.9",
"@jupyterlab/docprovider-extension": "^3.2.9",
"@jupyterlab/documentsearch-extension": "^3.2.9",
"@jupyterlab/filebrowser-extension": "^3.2.9",
"@jupyterlab/fileeditor-extension": "^3.2.9",
"@jupyterlab/hub-extension": "^3.2.9",
"@jupyterlab/javascript-extension": "^3.2.9",
"@jupyterlab/json-extension": "^3.2.9",
"@jupyterlab/mainmenu-extension": "^3.2.9",
"@jupyterlab/mathjax2-extension": "^3.2.9",
"@jupyterlab/notebook-extension": "^3.2.9",
"@jupyterlab/pdf-extension": "^3.2.9",
"@jupyterlab/rendermime-extension": "^3.2.9",
"@jupyterlab/running-extension": "^3.2.9",
"@jupyterlab/shortcuts-extension": "^3.2.9",
"@jupyterlab/terminal-extension": "^3.2.9",
"@jupyterlab/theme-dark-extension": "^3.2.9",
"@jupyterlab/theme-light-extension": "^3.2.9",
"@jupyterlab/tooltip-extension": "^3.2.9",
"@jupyterlab/translation-extension": "^3.2.9",
"@jupyterlab/vega5-extension": "^3.2.9",
"@jupyterlab/application-extension": "^3.3.0",
"@jupyterlab/apputils-extension": "^3.3.0",
"@jupyterlab/celltags": "^3.3.0",
"@jupyterlab/codemirror-extension": "^3.3.0",
"@jupyterlab/completer-extension": "^3.3.0",
"@jupyterlab/console-extension": "^3.3.0",
"@jupyterlab/coreutils": "~5.3.0",
"@jupyterlab/docmanager-extension": "^3.3.0",
"@jupyterlab/docprovider-extension": "^3.3.0",
"@jupyterlab/documentsearch-extension": "^3.3.0",
"@jupyterlab/filebrowser-extension": "^3.3.0",
"@jupyterlab/fileeditor-extension": "^3.3.0",
"@jupyterlab/hub-extension": "^3.3.0",
"@jupyterlab/javascript-extension": "^3.3.0",
"@jupyterlab/json-extension": "^3.3.0",
"@jupyterlab/mainmenu-extension": "^3.3.0",
"@jupyterlab/mathjax2-extension": "^3.3.0",
"@jupyterlab/notebook-extension": "^3.3.0",
"@jupyterlab/pdf-extension": "^3.3.0",
"@jupyterlab/rendermime-extension": "^3.3.0",
"@jupyterlab/running-extension": "^3.3.0",
"@jupyterlab/shortcuts-extension": "^3.3.0",
"@jupyterlab/terminal-extension": "^3.3.0",
"@jupyterlab/theme-dark-extension": "^3.3.0",
"@jupyterlab/theme-light-extension": "^3.3.0",
"@jupyterlab/tooltip-extension": "^3.3.0",
"@jupyterlab/translation-extension": "^3.3.0",
"@jupyterlab/vega5-extension": "^3.3.0",
"@retrolab/application": "^0.3.19",
"@retrolab/application-extension": "^0.3.19",
"@retrolab/console-extension": "^0.3.19",
Expand All @@ -131,8 +131,8 @@
"@retrolab/ui-components": "^0.3.19"
},
"devDependencies": {
"@jupyterlab/builder": "^3.2.9",
"@jupyterlab/buildutils": "^3.2.9",
"@jupyterlab/builder": "^3.3.0",
"@jupyterlab/buildutils": "^3.3.0",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"file-loader": "~5.0.2",
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": "^3.2.9",
"@jupyterlab/buildutils": "^3.3.0",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.1.3"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}
},
"devDependencies": {
"@jupyterlab/buildutils": "^3.2.9",
"@jupyterlab/buildutils": "^3.3.0",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",
Expand Down
24 changes: 12 additions & 12 deletions packages/application-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^3.2.9",
"@jupyterlab/apputils": "^3.2.9",
"@jupyterlab/celltags": "^3.2.9",
"@jupyterlab/codeeditor": "^3.2.9",
"@jupyterlab/codemirror": "^3.2.9",
"@jupyterlab/console": "^3.2.9",
"@jupyterlab/coreutils": "^5.2.9",
"@jupyterlab/docmanager": "^3.2.9",
"@jupyterlab/docregistry": "^3.2.9",
"@jupyterlab/mainmenu": "^3.2.9",
"@jupyterlab/settingregistry": "^3.2.9",
"@jupyterlab/translation": "^3.2.9",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/apputils": "^3.3.0",
"@jupyterlab/celltags": "^3.3.0",
"@jupyterlab/codeeditor": "^3.3.0",
"@jupyterlab/codemirror": "^3.3.0",
"@jupyterlab/console": "^3.3.0",
"@jupyterlab/coreutils": "^5.3.0",
"@jupyterlab/docmanager": "^3.3.0",
"@jupyterlab/docregistry": "^3.3.0",
"@jupyterlab/mainmenu": "^3.3.0",
"@jupyterlab/settingregistry": "^3.3.0",
"@jupyterlab/translation": "^3.3.0",
"@lumino/coreutils": "^1.8.0",
"@lumino/disposable": "^1.7.0",
"@lumino/widgets": "^1.23.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/application/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^3.2.9",
"@jupyterlab/coreutils": "^5.2.9",
"@jupyterlab/docregistry": "^3.2.9",
"@jupyterlab/rendermime-interfaces": "^3.2.9",
"@jupyterlab/ui-components": "^3.2.9",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/coreutils": "^5.3.0",
"@jupyterlab/docregistry": "^3.3.0",
"@jupyterlab/rendermime-interfaces": "^3.3.0",
"@jupyterlab/ui-components": "^3.3.0",
"@lumino/algorithm": "^1.6.0",
"@lumino/coreutils": "^1.8.0",
"@lumino/messaging": "^1.7.0",
Expand All @@ -58,7 +58,7 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.12.1",
"@jupyterlab/testutils": "^3.2.9",
"@jupyterlab/testutils": "^3.3.0",
"@types/jest": "^26.0.10",
"jest": "^26.4.2",
"rimraf": "~3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/console-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^3.2.9",
"@jupyterlab/console": "^3.2.9",
"@jupyterlab/coreutils": "^5.2.9",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/console": "^3.3.0",
"@jupyterlab/coreutils": "^5.3.0",
"@lumino/algorithm": "^1.6.0"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/docmanager-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^3.2.9",
"@jupyterlab/coreutils": "^5.2.9",
"@jupyterlab/docmanager": "^3.2.9",
"@jupyterlab/docregistry": "^3.2.9",
"@jupyterlab/services": "^6.2.9",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/coreutils": "^5.3.0",
"@jupyterlab/docmanager": "^3.3.0",
"@jupyterlab/docregistry": "^3.3.0",
"@jupyterlab/services": "^6.3.0",
"@lumino/algorithm": "^1.6.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/documentsearch-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^3.2.9",
"@jupyterlab/documentsearch": "^3.2.9",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/documentsearch": "^3.3.0",
"@lumino/widgets": "^1.23.0",
"@retrolab/application": "^0.3.19"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/help-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^3.2.9",
"@jupyterlab/apputils": "^3.2.9",
"@jupyterlab/mainmenu": "^3.2.9",
"@jupyterlab/translation": "^3.2.9",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/apputils": "^3.3.0",
"@jupyterlab/mainmenu": "^3.3.0",
"@jupyterlab/translation": "^3.3.0",
"@retrolab/ui-components": "^0.3.19"
},
"devDependencies": {
Expand Down
19 changes: 10 additions & 9 deletions packages/lab-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@
"watch:src": "tsc -w"
},
"dependencies": {
"@jupyterlab/application": "^3.2.9",
"@jupyterlab/apputils": "^3.2.9",
"@jupyterlab/coreutils": "^5.2.9",
"@jupyterlab/docregistry": "^3.2.9",
"@jupyterlab/mainmenu": "^3.2.9",
"@jupyterlab/notebook": "^3.2.9",
"@jupyterlab/translation": "^3.2.9",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/apputils": "^3.3.0",
"@jupyterlab/coreutils": "^5.3.0",
"@jupyterlab/docregistry": "^3.3.0",
"@jupyterlab/mainmenu": "^3.3.0",
"@jupyterlab/notebook": "^3.3.0",
"@jupyterlab/translation": "^3.3.0",
"@lumino/commands": "^1.15.0",
"@lumino/disposable": "^1.7.0",
"@retrolab/application": "^0.3.19"
},
"devDependencies": {
"@jupyterlab/builder": "^3.2.9",
"@jupyterlab/builder": "^3.3.0",
"rimraf": "~3.0.0",
"typescript": "~4.1.3"
},
Expand All @@ -64,7 +64,8 @@
},
"jupyterlab": {
"extension": true,
"outputDir": "../../retrolab/labextension"
"outputDir": "../../retrolab/labextension",
"schemaDir": "schema"
},
"styleModule": "style/index.js"
}
10 changes: 10 additions & 0 deletions packages/lab-extension/schema/interface-switcher.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"title": "Interface Switcher",
"description": "Interface Switcher settings.",
"jupyter.lab.toolbars": {
"Notebook": [{ "name": "interfaceSwitcher", "rank": 990 }]
},
"properties": {},
"additionalProperties": false,
"type": "object"
}
Loading

0 comments on commit c15e26b

Please sign in to comment.