Update JupyterCAD (#10)

* Update jcad * WAT * Update * debug ui test * UI-tests Press ok button upon removal * Update snapshot and yarn.lock --------- Co-authored-by: Duc Trung Le <[email protected]>
jupytercad · Jul 2, 2024 · c7b2060 · c7b2060
1 parent 796837a
commit c7b2060
Show file tree

Hide file tree

Showing 7 changed files with 972 additions and 588 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -107,7 +107,7 @@ jobs:
         shell: bash -l {0}
         run: |
           set -eux
-          pip install "jupyterlab>=4.0.0,<5" "jupytercad>=2.0.0a1" jupytercad_freecad*.whl
+          pip install "jupyterlab>=4.0.0,<4.2.0" "jupytercad>=2.0.0a1" jupytercad_freecad*.whl
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/package.json b/package.json
@@ -7,9 +7,9 @@
         "jupyterlab",
         "jupyterlab-extension"
     ],
-    "homepage": "https://github.com/jupytercad/jupytercad-freecad",
+    "homepage": "https://github.com/jupytercad/JupyterCAD-FreeCAD",
     "bugs": {
-        "url": "https://github.com/jupytercad/jupytercad-freecad/issues"
+        "url": "https://github.com/jupytercad/JupyterCAD-FreeCAD/issues"
     },
     "license": "BSD-3-Clause",
     "author": "JupyterCad contributors",
@@ -22,7 +22,7 @@
     "style": "style/index.css",
     "repository": {
         "type": "git",
-        "url": "https://github.com/jupytercad/jupytercad-freecad.git"
+        "url": "https://github.com/jupytercad/JupyterCAD-FreeCAD"
     },
     "scripts": {
         "build": "jlpm build:lib && jlpm build:labextension:dev",
@@ -53,9 +53,9 @@
     "dependencies": {
         "@jupyter/collaboration": "^2.0.0",
         "@jupyter/docprovider": "^2.0.0",
-        "@jupytercad/base": "^2.0.0-alpha.1",
-        "@jupytercad/jupytercad-core": "^2.0.0-alpha.1",
-        "@jupytercad/schema": "^2.0.0-alpha.1",
+        "@jupytercad/base": "^2.0.0",
+        "@jupytercad/jupytercad-core": "^2.0.0",
+        "@jupytercad/schema": "^2.0.0",
         "@jupyterlab/application": "^4.0.0"
     },
     "devDependencies": {

diff --git a/pyproject.toml b/pyproject.toml
@@ -28,7 +28,7 @@ classifiers = [
 ]
 dependencies = [
     "jupyter_ydoc>=2,<3",
-    "jupytercad_core>=2.0.0a1,<3",
+    "jupytercad_core>=2.0.0,<3",
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 

diff --git a/ui-tests/tests/ui.spec.ts b/ui-tests/tests/ui.spec.ts
@@ -169,6 +169,10 @@ test.describe('UI Test', () => {
         .nth(1)
         .click();
 
+      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' })

diff --git a/ui-tests/tests/ui.spec.ts-snapshots/Render-example5-FCStd-linux.png b/ui-tests/tests/ui.spec.ts-snapshots/Render-example5-FCStd-linux.png