Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to JupyterLab beta 2 #130

Merged
merged 3 commits into from
Apr 25, 2023
Merged

Update to JupyterLab beta 2 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
671714b
Update to beta 2
trungleduc Apr 25, 2023
0deadbe
Fix yjs error message
trungleduc Apr 25, 2023
323bc4b
Update snapshot
trungleduc Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@
"@jupyter/collaboration": "^1.0.0-alpha.7",
"@jupyter/docprovider": "^1.0.0-alpha.8",
"@jupyter/ydoc": "^0.3.4 || ^1.0.2",
"@jupyterlab/application": "^4.0.0-beta.0",
"@jupyterlab/apputils": "^4.0.0-beta.0",
"@jupyterlab/coreutils": "^6.0.0-beta.0",
"@jupyterlab/docregistry": "^4.0.0-beta.0",
"@jupyterlab/filebrowser": "^4.0.0-beta.0",
"@jupyterlab/launcher": "^4.0.0-beta.0",
"@jupyterlab/mainmenu": "^4.0.0-beta.0",
"@jupyterlab/notebook": "^4.0.0-beta.0",
"@jupyterlab/observables": "^5.0.0-beta.0",
"@jupyterlab/services": "^7.0.0-beta.0",
"@jupyterlab/translation": "^4.0.0-beta.0",
"@jupyterlab/ui-components": "^4.0.0-beta.0",
"@jupyterlab/application": "^4.0.0-beta.2",
"@jupyterlab/apputils": "^4.0.0-beta.2",
"@jupyterlab/coreutils": "^6.0.0-beta.2",
"@jupyterlab/docregistry": "^4.0.0-beta.2",
"@jupyterlab/filebrowser": "^4.0.0-beta.2",
"@jupyterlab/launcher": "^4.0.0-beta.2",
"@jupyterlab/mainmenu": "^4.0.0-beta.2",
"@jupyterlab/notebook": "^4.0.0-beta.2",
"@jupyterlab/observables": "^5.0.0-beta.2",
"@jupyterlab/services": "^7.0.0-beta.2",
"@jupyterlab/translation": "^4.0.0-beta.2",
"@jupyterlab/ui-components": "^4.0.0-beta.2",
"@lumino/commands": "^2.0.0",
"@lumino/coreutils": "^2.0.0",
"@lumino/signaling": "^2.0.0",
Expand All @@ -91,14 +91,14 @@
"uuid": "^8.3.2"
},
"resolutions": {
"@jupyterlab/apputils": "~4.0.0-beta.1",
"@jupyterlab/apputils": "~4.0.0-beta.2",
"@lumino/coreutils": "^2.0.0",
"@jupyterlab/notebook": "~4.0.0-beta.1",
"@jupyterlab/services": " ^7.0.0-beta.0"
"@jupyterlab/notebook": "~4.0.0-beta.2",
"@jupyterlab/services": " ^7.0.0-beta.2"
},
"devDependencies": {
"@apidevtools/json-schema-ref-parser": "^9.0.9",
"@jupyterlab/builder": "^4.0.0-beta.0",
"@jupyterlab/builder": "^4.0.0-beta.2",
"@types/node": "^16.11.10",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
Expand Down Expand Up @@ -132,7 +132,11 @@
"@jupyter-widgets/base": {
"bundled": false,
"singleton": true
},
"yjs": {
"bundled": false,
"singleton": true
}
}
}
}
}
12 changes: 2 additions & 10 deletions ui-tests/jupyter_server_test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@
opens the server to the world and provide access to JupyterLab
JavaScript objects through the global window variable.
"""
import os
from tempfile import mkdtemp

c.ServerApp.port = 8888
c.ServerApp.port_retries = 0
c.ServerApp.open_browser = False
from jupyterlab.galata import configure_jupyter_server

c.ServerApp.root_dir = mkdtemp(prefix='galata-test-')
c.ServerApp.token = ""
c.ServerApp.password = ""
c.ServerApp.disable_check_xsrf = True
c.LabApp.expose_app_in_browser = True
configure_jupyter_server(c)
c.LabApp.collaborative = True
# Uncomment to set server log level to debug level
# c.ServerApp.log_level = "DEBUG"
4 changes: 2 additions & 2 deletions ui-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test:debug": "PWDEBUG=1 npx playwright test"
},
"devDependencies": {
"@jupyterlab/galata": "5.0.0-alpha.14",
"@playwright/test": "^1.32.3"
"@jupyterlab/galata": "^5.0.0-beta.0",
"@playwright/test": "^1.32.0"
}
}
Binary file modified ...sts/tests/sketcher.spec.ts-snapshots/Sketcher-Circle-example-2D-FCStd-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ts/tests/sketcher.spec.ts-snapshots/Sketcher-Display-example-2D-FCStd-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ui-tests/tests/tree.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test.describe('Tree UI test', () => {
.nth(4)
.click();

// expect(errors).toBe(0);
expect(errors).toBe(0);
const tree = await page.getByRole('region', {
name: 'Objects tree Section'
});
Expand Down
8 changes: 4 additions & 4 deletions ui-tests/tests/ui.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ test.describe('UI Test', () => {
.click();
await page.waitForTimeout(1000);
const main = await page.$('#jp-main-split-panel');
// expect(errors).toBe(0);
expect(errors).toBe(0);
if (main) {
expect(await main.screenshot()).toMatchSnapshot({
name: `Render-${file}.png`
Expand Down Expand Up @@ -152,7 +152,7 @@ test.describe('UI Test', () => {
.click();

await page.waitForTimeout(1000);
// expect(errors).toBe(0);
expect(errors).toBe(0);
const main = await page.$('#jp-main-split-panel');
if (main) {
expect(await main.screenshot()).toMatchSnapshot({
Expand Down Expand Up @@ -189,7 +189,7 @@ test.describe('UI Test', () => {
.click();

await page.waitForTimeout(1000);
// expect(errors).toBe(0);
expect(errors).toBe(0);
const main = await page.$('#jp-main-split-panel');
if (main) {
expect(await main.screenshot()).toMatchSnapshot({
Expand Down Expand Up @@ -233,7 +233,7 @@ test.describe('UI Test', () => {
.click();

await page.waitForTimeout(1000);
// expect(errors).toBe(0);
expect(errors).toBe(0);
const main = await page.$('#jp-main-split-panel');
if (main) {
expect(await main.screenshot()).toMatchSnapshot({
Expand Down
Loading