Merge remote-tracking branch 'origin/master' into ux-improvements

jupyterlab · Sep 11, 2024 · 95ab2c8 · 95ab2c8
2 parents 4a59993 + 732b86b
commit 95ab2c8
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 171 deletions.
diff --git a/binder/requirements.txt b/binder/requirements.txt
@@ -1,4 +1,3 @@
-jupyter_packaging ~=0.12.3,<2
-jupyterlab ~=4.0
-setuptools
+jupyterlab==4.2.5
+jupyter-collaboration==3.0.0b3
 nbgitpuller
diff --git a/yarn.lock b/yarn.lock
@@ -553,22 +553,8 @@ __metadata:
  "@lumino/widgets": ^2.3.2
  "@types/react": ^18.0.26
  react: ^18.2.0
- sanitize-html: ~2.12.1
- checksum: a2307657bfab1aff687eccfdb7a2c378a40989beea618ad6e5a811dbd250753588ea704a11250ddef42a551c8360717c1fe4c8827c5e2c3bfff1e84fc7fdc836
- languageName: node
- linkType: hard
-
-"@jupyterlab/attachments@npm:^4.2.5":
- version: 4.2.5
- resolution: "@jupyterlab/attachments@npm:4.2.5"
- dependencies:
- "@jupyterlab/nbformat": ^4.2.5
- "@jupyterlab/observables": ^5.2.5
- "@jupyterlab/rendermime": ^4.2.5
- "@jupyterlab/rendermime-interfaces": ^3.10.5
- "@lumino/disposable": ^2.1.2
- "@lumino/signaling": ^2.1.2
- checksum: f49fc50f9889de9c7da88e004ae4dd562460da050ff373c946ec54863fcf293dacb5e15de57dbfb0b01141648989a873188a00b898cbb491bbd6c50140a0392c
+ sanitize-html: ~2.7.3
+ checksum: 360bf34e9810a7014c6637a6ac5c23a2ee73da8339675235cee3866beb3a477dc3b4d993c0a79da5ebe472f5c28fa131d507d62e20b3a93853f05e62b126add9
  languageName: node
  linkType: hard
 
@@ -613,72 +599,35 @@ __metadata:
  languageName: node
  linkType: hard
 
-"@jupyterlab/cells@npm:^4.2.5":
- version: 4.2.5
- resolution: "@jupyterlab/cells@npm:4.2.5"
- dependencies:
- "@codemirror/state": ^6.4.1
- "@codemirror/view": ^6.26.0
- "@jupyter/ydoc": ^2.0.1
- "@jupyterlab/apputils": ^4.3.5
- "@jupyterlab/attachments": ^4.2.5
- "@jupyterlab/codeeditor": ^4.2.5
- "@jupyterlab/codemirror": ^4.2.5
- "@jupyterlab/coreutils": ^6.2.5
- "@jupyterlab/documentsearch": ^4.2.5
- "@jupyterlab/filebrowser": ^4.2.5
- "@jupyterlab/nbformat": ^4.2.5
- "@jupyterlab/observables": ^5.2.5
- "@jupyterlab/outputarea": ^4.2.5
- "@jupyterlab/rendermime": ^4.2.5
- "@jupyterlab/services": ^7.2.5
- "@jupyterlab/toc": ^6.2.5
- "@jupyterlab/translation": ^4.2.5
- "@jupyterlab/ui-components": ^4.2.5
- "@lumino/algorithm": ^2.0.1
- "@lumino/coreutils": ^2.1.2
- "@lumino/domutils": ^2.0.1
- "@lumino/dragdrop": ^2.1.4
- "@lumino/messaging": ^2.0.1
- "@lumino/polling": ^2.1.2
- "@lumino/signaling": ^2.1.2
- "@lumino/virtualdom": ^2.0.1
- "@lumino/widgets": ^2.3.2
- react: ^18.2.0
- checksum: 6b2f84c0036dbc8808eb6f5057d07dae00d8000fac2f91568ca3f9b6abe30e6724d1be7ce53f085f6e8a93850817316f4e9e2c0e4fb81c3b29e104908a570d3b
- languageName: node
- linkType: hard
-
-"@jupyterlab/codeeditor@npm:^4.0.0, @jupyterlab/codeeditor@npm:^4.2.5":
- version: 4.2.5
- resolution: "@jupyterlab/codeeditor@npm:4.2.5"
+"@jupyterlab/codeeditor@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@jupyterlab/codeeditor@npm:4.0.0"
  dependencies:
- "@codemirror/state": ^6.4.1
- "@jupyter/ydoc": ^2.0.1
- "@jupyterlab/apputils": ^4.3.5
- "@jupyterlab/coreutils": ^6.2.5
- "@jupyterlab/nbformat": ^4.2.5
- "@jupyterlab/observables": ^5.2.5
- "@jupyterlab/statusbar": ^4.2.5
- "@jupyterlab/translation": ^4.2.5
- "@jupyterlab/ui-components": ^4.2.5
- "@lumino/coreutils": ^2.1.2
- "@lumino/disposable": ^2.1.2
- "@lumino/dragdrop": ^2.1.4
- "@lumino/messaging": ^2.0.1
- "@lumino/signaling": ^2.1.2
- "@lumino/widgets": ^2.3.2
+ "@codemirror/state": ^6.2.0
+ "@jupyter/ydoc": ^1.0.2
+ "@jupyterlab/coreutils": ^6.0.0
+ "@jupyterlab/nbformat": ^4.0.0
+ "@jupyterlab/observables": ^5.0.0
+ "@jupyterlab/statusbar": ^4.0.0
+ "@jupyterlab/translation": ^4.0.0
+ "@jupyterlab/ui-components": ^4.0.0
+ "@lumino/coreutils": ^2.1.1
+ "@lumino/disposable": ^2.1.1
+ "@lumino/dragdrop": ^2.1.1
+ "@lumino/messaging": ^2.0.0
+ "@lumino/signaling": ^2.1.1
+ "@lumino/widgets": ^2.1.1
  react: ^18.2.0
- checksum: 0b6f3f7a1fe02d2bb0b07571e03c6be645d58e182f3e1fcc5452e79dee8eab2097e13544eb461ff2bed72337bd335c539b8cb7cfe5f7bfd840163cc26d200c58
+ checksum: 8287d77738a41814eb83621691adbcee119e6a7b3d4741250e53fc11b8664ce1f6ae5a79150222b235d45ec7b22db980d773d77a517d6b5c6a241b8a27817b7a
  languageName: node
  linkType: hard
 
-"@jupyterlab/codemirror@npm:^4.2.5":
- version: 4.2.5
- resolution: "@jupyterlab/codemirror@npm:4.2.5"
+"@jupyterlab/codemirror@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@jupyterlab/codemirror@npm:4.0.0"
  dependencies:
- "@codemirror/autocomplete": ^6.15.0
- "@codemirror/commands": ^6.3.3
+ "@codemirror/autocomplete": ^6.5.1
+ "@codemirror/commands": ^6.2.3
  "@codemirror/lang-cpp": ^6.0.2
  "@codemirror/lang-css": ^6.2.1
  "@codemirror/lang-html": ^6.4.8
@@ -799,9 +748,9 @@ __metadata:
  languageName: node
  linkType: hard
 
-"@jupyterlab/filebrowser@npm:^4.0.0, @jupyterlab/filebrowser@npm:^4.2.5":
- version: 4.2.5
- resolution: "@jupyterlab/filebrowser@npm:4.2.5"
+"@jupyterlab/filebrowser@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@jupyterlab/filebrowser@npm:4.0.0"
  dependencies:
  "@jupyterlab/apputils": ^4.3.5
  "@jupyterlab/coreutils": ^6.2.5
@@ -978,104 +927,44 @@ __metadata:
  languageName: node
  linkType: hard
 
-"@jupyterlab/notebook@npm:^4.0.0":
- version: 4.2.5
- resolution: "@jupyterlab/notebook@npm:4.2.5"
- dependencies:
- "@jupyter/ydoc": ^2.0.1
- "@jupyterlab/apputils": ^4.3.5
- "@jupyterlab/cells": ^4.2.5
- "@jupyterlab/codeeditor": ^4.2.5
- "@jupyterlab/codemirror": ^4.2.5
- "@jupyterlab/coreutils": ^6.2.5
- "@jupyterlab/docregistry": ^4.2.5
- "@jupyterlab/documentsearch": ^4.2.5
- "@jupyterlab/lsp": ^4.2.5
- "@jupyterlab/nbformat": ^4.2.5
- "@jupyterlab/observables": ^5.2.5
- "@jupyterlab/rendermime": ^4.2.5
- "@jupyterlab/services": ^7.2.5
- "@jupyterlab/settingregistry": ^4.2.5
- "@jupyterlab/statusbar": ^4.2.5
- "@jupyterlab/toc": ^6.2.5
- "@jupyterlab/translation": ^4.2.5
- "@jupyterlab/ui-components": ^4.2.5
- "@lumino/algorithm": ^2.0.1
- "@lumino/coreutils": ^2.1.2
- "@lumino/disposable": ^2.1.2
- "@lumino/domutils": ^2.0.1
- "@lumino/dragdrop": ^2.1.4
- "@lumino/messaging": ^2.0.1
- "@lumino/polling": ^2.1.2
- "@lumino/properties": ^2.0.1
- "@lumino/signaling": ^2.1.2
- "@lumino/virtualdom": ^2.0.1
- "@lumino/widgets": ^2.3.2
- react: ^18.2.0
- checksum: 1c91b42e890407574451903af7d48db8c216fa9e27ecc4e60ee76366572029ff73be3974085427b72eaedf67e718a7d4f93207f7b66dd3cf27a0b51172ca7727
- languageName: node
- linkType: hard
-
-"@jupyterlab/observables@npm:^5.2.5":
- version: 5.2.5
- resolution: "@jupyterlab/observables@npm:5.2.5"
- dependencies:
- "@lumino/algorithm": ^2.0.1
- "@lumino/coreutils": ^2.1.2
- "@lumino/disposable": ^2.1.2
- "@lumino/messaging": ^2.0.1
- "@lumino/signaling": ^2.1.2
- checksum: 21fd2828463c08a770714692ff44aeca500f8ea8f3a743ad203a61fbf04cfa81921a47b432d8e65f4935fb45c08fce2b8858cb7e2198cc9bf0fa51f482ec37bd
- languageName: node
- linkType: hard
-
-"@jupyterlab/outputarea@npm:^4.2.5":
- version: 4.2.5
- resolution: "@jupyterlab/outputarea@npm:4.2.5"
+"@jupyterlab/observables@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "@jupyterlab/observables@npm:5.0.0"
  dependencies:
- "@jupyterlab/apputils": ^4.3.5
- "@jupyterlab/nbformat": ^4.2.5
- "@jupyterlab/observables": ^5.2.5
- "@jupyterlab/rendermime": ^4.2.5
- "@jupyterlab/rendermime-interfaces": ^3.10.5
- "@jupyterlab/services": ^7.2.5
- "@jupyterlab/translation": ^4.2.5
- "@lumino/algorithm": ^2.0.1
- "@lumino/coreutils": ^2.1.2
- "@lumino/disposable": ^2.1.2
- "@lumino/messaging": ^2.0.1
- "@lumino/properties": ^2.0.1
- "@lumino/signaling": ^2.1.2
- "@lumino/widgets": ^2.3.2
- checksum: 0e2834244dfc12491d7207e9749c92caaa44424e5541cb227f5933a61884e6d42c67791f5c8982cbefebf6b7ce94fe595e633571d9ebc381dd130616899a4291
+ "@lumino/algorithm": ^2.0.0
+ "@lumino/coreutils": ^2.1.1
+ "@lumino/disposable": ^2.1.1
+ "@lumino/messaging": ^2.0.0
+ "@lumino/signaling": ^2.1.1
+ checksum: 1554f473e0ab0eef288ea86945c03a07d79f478bfdf55651036161a58cd1d9a0695e202ced0ebe3a6863f73ba12ccd85b86f7a4c2e6f9fe41ccddb0c4fbbc33e
  languageName: node
  linkType: hard
 
-"@jupyterlab/rendermime-interfaces@npm:^3.10.5":
- version: 3.10.5
- resolution: "@jupyterlab/rendermime-interfaces@npm:3.10.5"
+"@jupyterlab/rendermime-interfaces@npm:^3.8.0":
+ version: 3.8.0
+ resolution: "@jupyterlab/rendermime-interfaces@npm:3.8.0"
  dependencies:
- "@lumino/coreutils": ^1.11.0 || ^2.1.2
- "@lumino/widgets": ^1.37.2 || ^2.3.2
- checksum: acfb10315a3ed4d0b0ef664437b33f8938968c61993351fd4067b0eaf6cb6ccd4c5caf50ae050d184a34b35b88d844eee6689d00244e54a02b228c02eab544b4
+ "@lumino/coreutils": ^2.1.1
+ "@lumino/widgets": ^2.1.1
+ checksum: 5e70a58a4d8aa7380a041d267972851b9b3fa5e4d68d254ede51c9e5bea4a76b38d47bc5c512e2fd84cd297f5bcaf9cbc9f73ba0824b5b910b10043309a820c7
  languageName: node
  linkType: hard
 
-"@jupyterlab/rendermime@npm:^4.2.5":
- version: 4.2.5
- resolution: "@jupyterlab/rendermime@npm:4.2.5"
+"@jupyterlab/rendermime@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@jupyterlab/rendermime@npm:4.0.0"
  dependencies:
- "@jupyterlab/apputils": ^4.3.5
- "@jupyterlab/coreutils": ^6.2.5
- "@jupyterlab/nbformat": ^4.2.5
- "@jupyterlab/observables": ^5.2.5
- "@jupyterlab/rendermime-interfaces": ^3.10.5
- "@jupyterlab/services": ^7.2.5
- "@jupyterlab/translation": ^4.2.5
- "@lumino/coreutils": ^2.1.2
- "@lumino/messaging": ^2.0.1
- "@lumino/signaling": ^2.1.2
- "@lumino/widgets": ^2.3.2
+ "@jupyterlab/apputils": ^4.0.0
+ "@jupyterlab/coreutils": ^6.0.0
+ "@jupyterlab/nbformat": ^4.0.0
+ "@jupyterlab/observables": ^5.0.0
+ "@jupyterlab/rendermime-interfaces": ^3.8.0
+ "@jupyterlab/services": ^7.0.0
+ "@jupyterlab/translation": ^4.0.0
+ "@lumino/coreutils": ^2.1.1
+ "@lumino/messaging": ^2.0.0
+ "@lumino/signaling": ^2.1.1
+ "@lumino/widgets": ^2.1.1
  lodash.escape: ^4.0.1
  checksum: e3e68c66306dc4bc7d4497d017e9e32cbfacfdc3ba14da6dfa6d7dbd328a3e8d5b710260365a06cd508209393e21985e7a69d0a160e239e4fdc1f0eb0874f35c
  languageName: node