Skip to content

Commit

Permalink
bump jupyterlab, notebook and ydoc dependencies (#1892)
Browse files Browse the repository at this point in the history
* bump ydoc dependency

* Bump jupyterlab, notebook and regenerate yarn.lock
  • Loading branch information
brichet authored Jun 18, 2024
1 parent 933b5d8 commit 06630f7
Show file tree
Hide file tree
Showing 4 changed files with 2,006 additions and 1,906 deletions.
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,29 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.0",
"@jupyter-notebook/tree": "^7.1.0",
"@jupyter/ydoc": "^1.1.1",
"@jupyterlab/application": "^4.1.0",
"@jupyterlab/apputils": "^4.2.0",
"@jupyterlab/cells": "^4.1.0",
"@jupyterlab/coreutils": "^6.1.0",
"@jupyterlab/docregistry": "^4.1.0",
"@jupyterlab/mainmenu": "^4.1.0",
"@jupyterlab/nbformat": "^4.1.0",
"@jupyterlab/notebook": "^4.1.0",
"@jupyterlab/observables": "^5.1.0",
"@jupyterlab/services": "^7.1.0",
"@jupyterlab/settingregistry": "^4.1.0",
"@jupyter-notebook/application": "^7.2.0",
"@jupyter-notebook/tree": "^7.2.0",
"@jupyter/ydoc": "^2.0.0",
"@jupyterlab/application": "^4.2.0",
"@jupyterlab/apputils": "^4.3.0",
"@jupyterlab/cells": "^4.2.0",
"@jupyterlab/coreutils": "^6.2.0",
"@jupyterlab/docregistry": "^4.2.0",
"@jupyterlab/mainmenu": "^4.2.0",
"@jupyterlab/nbformat": "^4.2.0",
"@jupyterlab/notebook": "^4.2.0",
"@jupyterlab/observables": "^5.2.0",
"@jupyterlab/services": "^7.2.0",
"@jupyterlab/settingregistry": "^4.2.0",
"@lumino/coreutils": "^2.1.2",
"@lumino/disposable": "^2.1.2",
"@lumino/messaging": "^2.0.1",
"@lumino/signaling": "^2.1.2",
"@lumino/widgets": "^2.3.1"
"@lumino/widgets": "^2.3.2"
},
"devDependencies": {
"@jupyterlab/builder": "^4.1.0",
"@jupyterlab/galata": "^5.1.0",
"@jupyterlab/builder": "^4.2.0",
"@jupyterlab/galata": "^5.2.0",
"@playwright/test": "^1.32.2",
"@types/codemirror": "^5.60.5",
"@typescript-eslint/eslint-plugin": "^5.0.0",
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"hatchling>=1.10.0",
"jupyterlab>=4.1.0,<5",

This comment has been minimized.

Copy link
@nthiery

nthiery Jun 21, 2024

Contributor

Hello @brichet,
I have a conflict with jupyterlab-deck not working well with jupyterlab >= 4.1 while nbgrader requires >=4.2. How necessary is the latter version constraint?
Of couse it would be best to fix jupyterlab-deck in the first place :-)

This comment has been minimized.

Copy link
@brichet

brichet Jun 24, 2024

Author Contributor

It was about jupyter_ydoc dependency which broke the extension compatibility check:
https://github.com/jupyter/nbgrader/actions/runs/9548553309/job/26315991458
nbgrader pinedjupyter_ydoc<2, but jupyterlab 4.2 need to update it.

Anyway, except for the warning, everything should work with lab < 4.2 and jupyter_ydoc < 2

"jupyterlab>=4.2.0,<5",
]
build-backend = "hatchling.build"

Expand Down Expand Up @@ -38,11 +38,11 @@ dependencies = [
"jsonschema>=3",
"jupyter_client<9",
"jupyter_server>=2",
"jupyterlab>=4.1.0,<5",
"jupyterlab>=4.2.0,<5",
"jupyterlab_server",
"nbclient>=0.6.1",
"nbconvert>=6",
"notebook>=7.0.2,<8",
"notebook>=7.2.0,<8",
"python-dateutil>=2.8",
"rapidfuzz>=1.8",
"requests>=2.26",
Expand Down
7 changes: 5 additions & 2 deletions src/common/validate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { Widget } from '@lumino/widgets';
const CSS_ERROR_DIALOG = 'nbgrader-ErrorDialog'
const CSS_SUCCESS_DIALOG = 'nbgrader-SuccessDialog'

export function showNbGraderDialog<T>(options: Partial<Dialog.IOptions<T>> = {}, error: boolean = false): Promise<Dialog.IResult<T>> {
export function showNbGraderDialog<T extends Widget>(
options: Partial<Dialog.IOptions<T>> = {},
error: boolean = false
): Promise<Dialog.IResult<T>> {
const dialog = new Dialog(options);

if (error) dialog.addClass(CSS_ERROR_DIALOG);
Expand Down Expand Up @@ -123,7 +126,7 @@ export function validate(

let b: Widget;
b = new Widget({node: body});
showNbGraderDialog({
showNbGraderDialog<Widget>({
title: "Validation Results",
body: b,
buttons: [Dialog.okButton()]
Expand Down
Loading

0 comments on commit 06630f7

Please sign in to comment.