Merge pull request #319 from jtpio/lab-4

Update to JupyterLab 4.0 alpha
jupyterlab · Jan 21, 2022 · 879e644 · 879e644
2 parents 237c456 + 5bcfa90
commit 879e644
Show file tree

Hide file tree

Showing 55 changed files with 2,822 additions and 2,439 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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

diff --git a/.github/workflows/buildutils.yml b/.github/workflows/buildutils.yml
@@ -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
 
@@ -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
diff --git a/app/index.js b/app/index.js
@@ -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 }) =>
@@ -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')
  ];
 

diff --git a/app/package.json b/app/package.json
@@ -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",
@@ -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",
@@ -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",
@@ -212,6 +216,7 @@
  "@jupyterlab/terminal",
  "@jupyterlab/tooltip",
  "@jupyterlab/translation",
+ "@jupyterlab/user",
  "@jupyterlab/ui-components",
  "@lumino/algorithm",
  "@lumino/application",

diff --git a/binder/postBuild b/binder/postBuild
@@ -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
diff --git a/buildutils/package.json b/buildutils/package.json
@@ -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"

diff --git a/jupyter_config.json b/jupyter_config.json
@@ -1,4 +1,4 @@
 {
- "RetroApp": { "collaborative": true },
+ "RetroApp": { "collaborative": true, "expose_app_in_browser": true },
  "LabApp": { "collaborative": true, "expose_app_in_browser": true }
 }
diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/application-extension/package.json b/packages/application-extension/package.json
@@ -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",