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

Bump JupyterCAD 3.0.0 #28

Merged
merged 12 commits into from
Dec 5, 2024
Merged

Bump JupyterCAD 3.0.0 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a9c5bdd
Bump jupytercad
martinRenou Dec 5, 2024
115d158
Bump JS
martinRenou Dec 5, 2024
3f70718
Update galata
martinRenou Dec 5, 2024
39c393c
Gneh
martinRenou Dec 5, 2024
a49ca79
Redo yarn.lock
martinRenou Dec 5, 2024
533f38e
Update test
martinRenou Dec 5, 2024
2e6cc47
Update tests
martinRenou Dec 5, 2024
4e2c796
Do not wait for open
martinRenou Dec 5, 2024
a9a5f07
Set retries
martinRenou Dec 5, 2024
8770f88
Remove icon
martinRenou Dec 5, 2024
13476fe
Undo changes on the ui-tests
martinRenou Dec 5, 2024
f814c17
Trying to fix icon
martinRenou Dec 5, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ jobs:
micromamba-version: '1.5.5-0'
environment-name: cad
create-args: >-
python=3.10
jupyterlab=4
python=3.9
jupyterlab
freecad=0.21.2

- name: Download extension package
Expand All @@ -107,7 +107,7 @@ jobs:
shell: bash -l {0}
run: |
set -eux
pip install "jupyterlab>=4.0.0,<4.2.0" "jupytercad>=3.0.0a6" jupytercad_freecad*.whl
pip install "jupytercad>=3.0.0" jupytercad_freecad*.whl

- name: Install dependencies
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_galata_references.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
shell: bash -l {0}
run: |
whereis python
pip install "jupyterlab>=4.0.0,<5" "jupytercad>=3.0.0a6" jupytercad_freecad*.whl
pip install "jupytercad>=3.0.0" jupytercad_freecad*.whl

- name: Install dependencies
shell: bash -l {0}
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
},
"dependencies": {
"@jupyter/collaborative-drive": "^3.0.0",
"@jupytercad/base": "^3.0.0-alpha.5",
"@jupytercad/jupytercad-core": "^3.0.0-alpha.5",
"@jupytercad/schema": "^3.0.0-alpha.5",
"@jupytercad/base": "^3.0.0",
"@jupytercad/jupytercad-core": "^3.0.0",
"@jupytercad/schema": "^3.0.0",
"@jupyterlab/application": "^4.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ classifiers = [
]
dependencies = [
"jupyter_ydoc>=3,<4",
"jupytercad_core>=3.0.0a1,<4",
"jupytercad_core>=3.0.0,<4",
]
dynamic = ["version", "description", "authors", "urls", "keywords"]

Expand Down
9 changes: 2 additions & 7 deletions style/freecad.svg
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/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.1.0",
"@jupyterlab/galata": "^5.2.5",
"@playwright/test": "^1.32.0",
"@types/klaw-sync": "^6.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion ui-tests/playwright.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
timeout: 120 * 1000,
reuseExistingServer: false
},
retries: 0,
retries: 1,
use: {
...baseConfig.use,
trace: 'on-first-retry'
Expand Down
45 changes: 13 additions & 32 deletions ui-tests/tests/ui.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,14 @@ test.describe('UI Test', () => {
await page.notebook.openByPath(fullPath);
await page.notebook.activate(fullPath);
await page.locator('div.jpcad-Spinner').waitFor({ state: 'hidden' });
await page.waitForTimeout(1000);

if (await page.getByRole('button', { name: 'Ok' }).isVisible()) {
await page.getByRole('button', { name: 'Ok' }).click();
}

await page
.getByRole('tablist', { name: 'main sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page
.getByRole('tablist', { name: 'alternate sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page.sidebar.close('left');
await page.sidebar.close('right');
await page.waitForTimeout(1000);
const main = await page.$('#jp-main-split-panel');
expect(errors).toBe(0);
Expand Down Expand Up @@ -131,14 +130,8 @@ test.describe('UI Test', () => {
});
await accept.click();

await page
.getByRole('tablist', { name: 'main sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page
.getByRole('tablist', { name: 'alternate sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page.sidebar.close('left');
await page.sidebar.close('right');

await page.waitForTimeout(1000);
expect(errors).toBe(0);
Expand Down Expand Up @@ -173,14 +166,8 @@ test.describe('UI Test', () => {
await page.getByRole('button', { name: 'Ok' }).click();
}

await page
.getByRole('tablist', { name: 'main sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page
.getByRole('tablist', { name: 'alternate sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page.sidebar.close('left');
await page.sidebar.close('right');

await page.waitForTimeout(1000);
expect(errors).toBe(0);
Expand Down Expand Up @@ -217,14 +204,8 @@ test.describe('UI Test', () => {
.click();

// Hide side bars for the screenshot
await page
.getByRole('tablist', { name: 'main sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page
.getByRole('tablist', { name: 'alternate sidebar' })
.getByRole('tab', { name: 'JupyterCad Control Panel' })
.click();
await page.sidebar.close('left');
await page.sidebar.close('right');

await page.waitForTimeout(1000);
expect(errors).toBe(0);
Expand Down
Loading
Loading