Bump JupyterCAD 3.0.0 (#28)

* Bump jupytercad * Bump JS * Update galata * Gneh * Redo yarn.lock * Update test * Update tests * Do not wait for open * Set retries * Remove icon * Undo changes on the ui-tests * Trying to fix icon
jupytercad · Dec 5, 2024 · eb212b1 · eb212b1
1 parent fad026e
commit eb212b1
Show file tree

Hide file tree

Showing 10 changed files with 1,556 additions and 2,020 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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
@@ -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}

diff --git a/.github/workflows/update_galata_references.yaml b/.github/workflows/update_galata_references.yaml
@@ -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}

diff --git a/package.json b/package.json
@@ -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": {

diff --git a/pyproject.toml b/pyproject.toml
@@ -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"]
 

diff --git a/style/freecad.svg b/style/freecad.svg
diff --git a/ui-tests/package.json b/ui-tests/package.json
@@ -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"
     },

diff --git a/ui-tests/playwright.config.js b/ui-tests/playwright.config.js
@@ -11,7 +11,7 @@ module.exports = {
     timeout: 120 * 1000,
     reuseExistingServer: false
   },
-  retries: 0,
+  retries: 1,
   use: {
     ...baseConfig.use,
     trace: 'on-first-retry'

diff --git a/ui-tests/tests/ui.spec.ts b/ui-tests/tests/ui.spec.ts
@@ -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);
@@ -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);
@@ -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);
@@ -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);