Lab 4 Lumino 2

Co-authored-by: Eric Charles <[email protected]>
jupyter-widgets · Apr 5, 2023 · 12d339e · 12d339e
1 parent 511663a
commit 12d339e
Show file tree

Hide file tree

Showing 16 changed files with 2,104 additions and 1,972 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
           cache: 'pip'
           cache-dependency-path: |
             **/setup.cfg
@@ -39,15 +39,15 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
           cache: 'pip'
           cache-dependency-path: |
             **/setup.cfg
             **/requirements*.txt
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install jupyterlab~=3.0
+          python -m pip install jupyterlab==4.0.0b0
       - name: Install node
         uses: actions/setup-node@v3
         with:
@@ -87,7 +87,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v3
@@ -118,7 +118,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
           cache: 'pip'
           cache-dependency-path: |
             **/setup.cfg
@@ -159,7 +159,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install -U jupyterlab~=3.2 jupyter-packaging~=0.10
+          python -m pip install -U jupyterlab==4.0.0b0 jupyter-packaging~=0.10
 
       - name: Install node
         uses: actions/setup-node@v3

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -5,7 +5,7 @@ ipykernel
 ipyleaflet
 jupyter-client
 jupyter-packaging
-jupyterlab >=3,<4
+jupyterlab ==4.0.0b0
 jupyterlite ==0.1.0b18
 matplotlib
 myst-nb >=0.17,<0.18

diff --git a/docs/source/changelog.md b/docs/source/changelog.md
@@ -6,9 +6,9 @@ This is a summary of changes in ipywidgets releases. For more detailed informati
 
 Highlights include:
 
- - Fix: revert removing ipykernel dependency [#3749](https://github.com/jupyter-widgets/ipywidgets/pull/3749)
- - Fix: structuredClone broke default serializer that depended on JSON/toJSON [#3738](https://github.com/jupyter-widgets/ipywidgets/pull/3738)
- - Fix: comm/ipykernel/manager runtime issues: [#3740](https://github.com/jupyter-widgets/ipywidgets/pull/3740), [#3737](https://github.com/jupyter-widgets/ipywidgets/pull/3737)
+- Fix: revert removing ipykernel dependency [#3749](https://github.com/jupyter-widgets/ipywidgets/pull/3749)
+- Fix: structuredClone broke default serializer that depended on JSON/toJSON [#3738](https://github.com/jupyter-widgets/ipywidgets/pull/3738)
+- Fix: comm/ipykernel/manager runtime issues: [#3740](https://github.com/jupyter-widgets/ipywidgets/pull/3740), [#3737](https://github.com/jupyter-widgets/ipywidgets/pull/3737)
 
 ## 8.0.5
 

diff --git a/examples/web3/package.json b/examples/web3/package.json
@@ -17,7 +17,7 @@
     "@jupyter-widgets/base": "^6.0.4",
     "@jupyter-widgets/controls": "^5.0.5",
     "@jupyter-widgets/html-manager": "^1.0.7",
-    "@jupyterlab/services": "^6.0.0",
+    "@jupyterlab/services": "^6.0.0 || ^7.0.0-beta.0",
     "codemirror": "^5.48.0",
     "font-awesome": "^4.7.0",
     "http-server": "^14.0.0"

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "typescript": "~4.9.4"
   },
   "devDependencies": {
-    "@jupyterlab/buildutils": "^3.5.2",
+    "@jupyterlab/buildutils": "^3.5.2 || ^4.0.0-beta.0",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",
     "eslint": "^8.32.0",

diff --git a/packages/base-manager/package.json b/packages/base-manager/package.json
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@jupyter-widgets/base": "^6.0.4",
-    "@jupyterlab/services": "^6.0.0",
-    "@lumino/coreutils": "^1.11.1",
+    "@jupyterlab/services": "^6.0.0 || ^7.0.0-beta.0",
+    "@lumino/coreutils": "^1.11.1 || ^2",
     "base64-js": "^1.2.1",
     "sanitize-html": "^2.3"
   },

diff --git a/packages/base/package.json b/packages/base/package.json
@@ -33,10 +33,10 @@
     "test:unit:ie": "npm run test:unit:default -- --browsers=IE"
   },
   "dependencies": {
-    "@jupyterlab/services": "^6.0.0",
-    "@lumino/coreutils": "^1.11.1",
-    "@lumino/messaging": "^1.10.1",
-    "@lumino/widgets": "^1.30.0",
+    "@jupyterlab/services": "^6.0.0 || ^7.0.0-beta.0",
+    "@lumino/coreutils": "^1.11.1 || ^2",
+    "@lumino/messaging": "^1.10.1 || ^2",
+    "@lumino/widgets": "^1.30.0 || ^2",
     "@types/backbone": "1.4.14",
     "@types/lodash": "^4.14.134",
     "backbone": "1.4.0",

diff --git a/packages/controls/package.json b/packages/controls/package.json
@@ -35,18 +35,18 @@
   },
   "dependencies": {
     "@jupyter-widgets/base": "^6.0.4",
-    "@lumino/algorithm": "^1.9.1",
-    "@lumino/domutils": "^1.8.1",
-    "@lumino/messaging": "^1.10.1",
-    "@lumino/signaling": "^1.10.1",
-    "@lumino/widgets": "^1.30.0",
+    "@lumino/algorithm": "^1.9.1 || ^2",
+    "@lumino/domutils": "^1.8.1 || ^2",
+    "@lumino/messaging": "^1.10.1 || ^2",
+    "@lumino/signaling": "^1.10.1 || ^2",
+    "@lumino/widgets": "^1.30.0 || ^2",
     "d3-color": "^3.0.1",
     "d3-format": "^3.0.1",
     "jquery": "^3.1.1",
     "nouislider": "15.4.0"
   },
   "devDependencies": {
-    "@jupyterlab/services": "^6.0.0",
+    "@jupyterlab/services": "^6.0.0 || ^7.0.0-beta.0",
     "@types/d3-color": "^3.0.2",
     "@types/d3-format": "^3.0.1",
     "@types/expect.js": "^0.3.29",

diff --git a/packages/html-manager/package.json b/packages/html-manager/package.json
@@ -41,11 +41,11 @@
     "@jupyter-widgets/controls": "^5.0.5",
     "@jupyter-widgets/output": "^6.0.4",
     "@jupyter-widgets/schema": "^0.5.2",
-    "@jupyterlab/outputarea": "^3.0.0",
-    "@jupyterlab/rendermime": "^3.0.0",
-    "@jupyterlab/rendermime-interfaces": "^3.0.0",
-    "@lumino/messaging": "^1.10.1",
-    "@lumino/widgets": "^1.30.0",
+    "@jupyterlab/outputarea": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/rendermime": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/rendermime-interfaces": "^3.0.0 || ^4.0.0-beta.0",
+    "@lumino/messaging": "^1.10.1 || ^2",
+    "@lumino/widgets": "^1.30.0 || ^2",
     "ajv": "^8.6.0",
     "jquery": "^3.1.1"
   },

diff --git a/python/jupyterlab_widgets/package.json b/python/jupyterlab_widgets/package.json
@@ -50,31 +50,31 @@
     "@jupyter-widgets/base-manager": "^1.0.5",
     "@jupyter-widgets/controls": "^5.0.5",
     "@jupyter-widgets/output": "^6.0.4",
-    "@jupyterlab/application": "^3.0.0",
-    "@jupyterlab/docregistry": "^3.0.0",
-    "@jupyterlab/logconsole": "^3.0.0",
-    "@jupyterlab/mainmenu": "^3.0.0",
-    "@jupyterlab/nbformat": "^3.0.0",
-    "@jupyterlab/notebook": "^3.0.0",
-    "@jupyterlab/outputarea": "^3.0.0",
-    "@jupyterlab/rendermime": "^3.0.0",
-    "@jupyterlab/rendermime-interfaces": "^3.0.0",
-    "@jupyterlab/services": "^6.0.0",
-    "@jupyterlab/settingregistry": "^3.0.0",
-    "@jupyterlab/translation": "^3.0.0",
-    "@lumino/algorithm": "^1.9.1",
-    "@lumino/coreutils": "^1.11.1",
-    "@lumino/disposable": "^1.10.1",
-    "@lumino/properties": "^1.8.1",
-    "@lumino/signaling": "^1.10.1",
-    "@lumino/widgets": "^1.30.0",
+    "@jupyterlab/application": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/docregistry": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/logconsole": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/mainmenu": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/nbformat": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/notebook": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/outputarea": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/rendermime": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/rendermime-interfaces": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/services": "^6.0.0 || ^7.0.0-beta.0",
+    "@jupyterlab/settingregistry": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/translation": "^3.0.0 || ^4.0.0-beta.0",
+    "@lumino/algorithm": "^1.9.1 || ^2",
+    "@lumino/coreutils": "^1.11.1 || ^2",
+    "@lumino/disposable": "^1.10.1 || ^2",
+    "@lumino/properties": "^1.8.1 || ^2",
+    "@lumino/signaling": "^1.10.1 || ^2",
+    "@lumino/widgets": "^1.30.0 || ^2",
     "@types/backbone": "1.4.14",
     "jquery": "^3.1.1",
     "semver": "^7.3.5"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.0",
-    "@jupyterlab/cells": "^3.0.0",
+    "@jupyterlab/builder": "^3.0.0 || ^4.0.0-beta.0",
+    "@jupyterlab/cells": "^3.0.0 || ^4.0.0-beta.0",
     "@types/semver": "^7.3.6",
     "@typescript-eslint/eslint-plugin": "^5.8.0",
     "@typescript-eslint/parser": "^5.8.0",

diff --git a/python/jupyterlab_widgets/src/manager.ts b/python/jupyterlab_widgets/src/manager.ts
@@ -455,7 +455,7 @@ export class WidgetManager extends LabWidgetManager {
    */
   private _saveState(): void {
     const state = this.get_state_sync({ drop_defaults: true });
-    this._context.model.metadata.set('widgets', {
+    this._context.contentsModel?.content.metadata.set('widgets', {
       'application/vnd.jupyter.widget-state+json': state,
     });
   }
@@ -512,7 +512,7 @@ export class WidgetManager extends LabWidgetManager {
    * Load widget state from notebook metadata
    */
   async _loadFromNotebook(notebook: INotebookModel): Promise<void> {
-    const widget_md = notebook.metadata.get('widgets') as any;
+    const widget_md = notebook.getMetadata('widgets') as any;
     // Restore any widgets from saved state that are not live
     if (widget_md && widget_md[WIDGET_STATE_MIMETYPE]) {
       let state = widget_md[WIDGET_STATE_MIMETYPE];

diff --git a/python/widgetsnbextension/package.json b/python/widgetsnbextension/package.json
@@ -27,9 +27,9 @@
     "@jupyter-widgets/controls": "^5.0.5",
     "@jupyter-widgets/html-manager": "^1.0.7",
     "@jupyter-widgets/output": "^6.0.4",
-    "@jupyterlab/services": "^6.0.0",
-    "@lumino/messaging": "^1.10.1",
-    "@lumino/widgets": "^1.30.0",
+    "@jupyterlab/services": "^6.0.0 || ^7.0.0-beta.0",
+    "@lumino/messaging": "^1.10.1 || ^2",
+    "@lumino/widgets": "^1.30.0 || ^2",
     "backbone": "1.4.0"
   },
   "devDependencies": {

diff --git a/ui-tests/jupyter_server_config.py b/ui-tests/jupyter_server_config.py
@@ -1,10 +1,6 @@
-from tempfile import mkdtemp
+from jupyterlab.galata import configure_jupyter_server
 
-c.ServerApp.port = 8888
-c.ServerApp.open_browser = False
-c.ServerApp.root_dir = mkdtemp(prefix='galata-test-')
-c.ServerApp.token = ""
-c.ServerApp.password = ""
-c.ServerApp.disable_check_xsrf = True
+configure_jupyter_server(c)
 
-c.LabApp.expose_app_in_browser = True
+# Uncomment to set server log level to debug level
+# c.ServerApp.log_level = "DEBUG"
diff --git a/ui-tests/package.json b/ui-tests/package.json
@@ -15,7 +15,7 @@
   "author": "Project Jupyter",
   "license": "BSD-3-Clause",
   "devDependencies": {
-    "@jupyterlab/galata": "^4.5.1",
+    "@jupyterlab/galata": "^5.0.0-beta.0",
     "yarn-deduplicate": "^6.0.1"
   }
 }