Merge branch 'main' into bbox-visible

jupytercad · Oct 30, 2024 · b3e77f6 · b3e77f6
2 parents 0c7f143 + 5c50fe4
commit b3e77f6
Show file tree

Hide file tree

Showing 19 changed files with 350 additions and 253 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,54 @@ pip install jupytercad-freecad
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 3.0.0a5
+
+([Full Changelog](https://github.com/jupytercad/JupyterCAD/compare/v3.0.0a4...8d0b77fa32ef01ed2b3d7f1d6f806aef3577c18f))
+
+### Enhancements made
+
+- Improve selection logic [#542](https://github.com/jupytercad/JupyterCAD/pull/542) ([@martinRenou](https://github.com/martinRenou))
+- Object properties panel: Use selected object name as the title [#540](https://github.com/jupytercad/JupyterCAD/pull/540) ([@martinRenou](https://github.com/martinRenou))
+- ClipPlane: fix z-fighting artifacts [#539](https://github.com/jupytercad/JupyterCAD/pull/539) ([@martinRenou](https://github.com/martinRenou))
+- Set visible back to True for operator inputs upon removal of the output [#534](https://github.com/jupytercad/JupyterCAD/pull/534) ([@martinRenou](https://github.com/martinRenou))
+- Allow opening JupyterCAD documents with the JSON viewer + Allow opening STL and STEP in JupyterLite [#531](https://github.com/jupytercad/JupyterCAD/pull/531) ([@martinRenou](https://github.com/martinRenou))
+- Grey icon in tabs [#527](https://github.com/jupytercad/JupyterCAD/pull/527) ([@martinRenou](https://github.com/martinRenou))
+- Reorder toolbar icons [#522](https://github.com/jupytercad/JupyterCAD/pull/522) ([@arjxn-py](https://github.com/arjxn-py))
+- Update main logo [#520](https://github.com/jupytercad/JupyterCAD/pull/520) ([@martinRenou](https://github.com/martinRenou))
+- JupyterCAD icons to left and right tabs [#519](https://github.com/jupytercad/JupyterCAD/pull/519) ([@martinRenou](https://github.com/martinRenou))
+
+### Bugs fixed
+
+- Re-add `setColor` api [#552](https://github.com/jupytercad/JupyterCAD/pull/552) ([@arjxn-py](https://github.com/arjxn-py))
+- Prevent getting back to non-wireframe after operator [#549](https://github.com/jupytercad/JupyterCAD/pull/549) ([@arjxn-py](https://github.com/arjxn-py))
+- Fix ui issues [#548](https://github.com/jupytercad/JupyterCAD/pull/548) ([@trungleduc](https://github.com/trungleduc))
+- Fix clip plane controls when switching camera projection [#538](https://github.com/jupytercad/JupyterCAD/pull/538) ([@martinRenou](https://github.com/martinRenou))
+- Revert "Orthographic camera: fix missing near and far parameters" [#536](https://github.com/jupytercad/JupyterCAD/pull/536) ([@martinRenou](https://github.com/martinRenou))
+- Fix context switching for the right panel [#533](https://github.com/jupytercad/JupyterCAD/pull/533) ([@martinRenou](https://github.com/martinRenou))
+- Update CAD app to include missing collaboration tokens [#530](https://github.com/jupytercad/JupyterCAD/pull/530) ([@martinRenou](https://github.com/martinRenou))
+- Set collaborative attribute to False in Jupyterlite [#525](https://github.com/jupytercad/JupyterCAD/pull/525) ([@martinRenou](https://github.com/martinRenou))
+- Cleanup and fix SVG logo [#523](https://github.com/jupytercad/JupyterCAD/pull/523) ([@martinRenou](https://github.com/martinRenou))
+- Fix bounding box on exploded view [#521](https://github.com/jupytercad/JupyterCAD/pull/521) ([@arjxn-py](https://github.com/arjxn-py))
+- Fix handling of theme change [#505](https://github.com/jupytercad/JupyterCAD/pull/505) ([@arjxn-py](https://github.com/arjxn-py))
+
+### Maintenance and upkeep improvements
+
+- Bump jupyter-collaboration v3 [#553](https://github.com/jupytercad/JupyterCAD/pull/553) ([@trungleduc](https://github.com/trungleduc))
+- Unpin jupyterlite-xeus in lite build [#541](https://github.com/jupytercad/JupyterCAD/pull/541) ([@martinRenou](https://github.com/martinRenou))
+- Pin Python in docs build [#528](https://github.com/jupytercad/JupyterCAD/pull/528) ([@martinRenou](https://github.com/martinRenou))
+
+### Documentation improvements
+
+- Pin Python in docs build [#528](https://github.com/jupytercad/JupyterCAD/pull/528) ([@martinRenou](https://github.com/martinRenou))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupytercad/JupyterCAD/graphs/contributors?from=2024-10-21&to=2024-10-29&type=c))
+
+[@arjxn-py](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Aarjxn-py+updated%3A2024-10-21..2024-10-29&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Agithub-actions+updated%3A2024-10-21..2024-10-29&type=Issues) | [@martinRenou](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3AmartinRenou+updated%3A2024-10-21..2024-10-29&type=Issues) | [@SylvainCorlay](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3ASylvainCorlay+updated%3A2024-10-21..2024-10-29&type=Issues) | [@trungleduc](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Atrungleduc+updated%3A2024-10-21..2024-10-29&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 3.0.0a4
 
 ([Full Changelog](https://github.com/jupytercad/JupyterCAD/compare/v3.0.0a3...b6be4f502cf89961d78cbd4afd96b36c0b65e102))
@@ -93,8 +141,6 @@ pip install jupytercad-freecad
 
 [@arjxn-py](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Aarjxn-py+updated%3A2024-10-09..2024-10-21&type=Issues) | [@davidbrochart](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Adavidbrochart+updated%3A2024-10-09..2024-10-21&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Agithub-actions+updated%3A2024-10-09..2024-10-21&type=Issues) | [@IsabelParedes](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3AIsabelParedes+updated%3A2024-10-09..2024-10-21&type=Issues) | [@martinRenou](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3AmartinRenou+updated%3A2024-10-09..2024-10-21&type=Issues) | [@SylvainCorlay](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3ASylvainCorlay+updated%3A2024-10-09..2024-10-21&type=Issues) | [@trungleduc](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Atrungleduc+updated%3A2024-10-09..2024-10-21&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 3.0.0a3
 
 ([Full Changelog](https://github.com/jupytercad/JupyterCAD/compare/@jupytercad/base@3.0.0-alpha.2...36bff8b5e9a8534c073008fea5ce1e61dfd5ee94))

diff --git a/examples/Notebook.ipynb b/examples/Notebook.ipynb
@@ -43,7 +43,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "doc.add_cone().add_sphere(radius=0.8).cut()"
+    "doc.add_cone().add_sphere(radius=0.8).cut(color='#ff0000')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ab3d7be6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "doc.set_color('Cut 1', '#00ff00')"
    ]
   },
   {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/jupytercad-root",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "private": true,
   "homepage": "https://github.com/jupytercad/JupyterCAD",
   "repository": {
@@ -52,8 +52,8 @@
     "build:app": "lerna run --ignore @jupytercad/jupytercad-lab build"
   },
   "resolutions": {
-    "@jupyter/collaboration": "^3.0.0-rc.1",
-    "@jupyter/ydoc": "^3.0.0-b0",
+    "@jupyter/collaboration": "^3.0.0",
+    "@jupyter/ydoc": "^3.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@lumino/coreutils": "^2.0.0",
     "@jupyterlab/notebook": "^4.0.0",

diff --git a/packages/base/package.json b/packages/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/base",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -36,10 +36,10 @@
   },
   "dependencies": {
     "@deathbeds/jupyterlab-rjsf": "^1.1.0",
-    "@jupyter/collaborative-drive": "^3.0.0-rc.1",
-    "@jupyter/ydoc": "^3.0.0-b0",
-    "@jupytercad/occ-worker": "^3.0.0-alpha.4",
-    "@jupytercad/schema": "^3.0.0-alpha.4",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/ydoc": "^3.0.0",
+    "@jupytercad/occ-worker": "^3.0.0-alpha.5",
+    "@jupytercad/schema": "^3.0.0-alpha.5",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/completer": "^4.2.4",

diff --git a/packages/occ-worker/package.json b/packages/occ-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/occ-worker",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "Jupytercad opencascade worker package.",
   "keywords": [
     "jupytercad"
@@ -36,8 +36,8 @@
     "watch": "tsc-watch --onSuccess \"webpack --config worker.webpack.config.js --mode=development\""
   },
   "dependencies": {
-    "@jupytercad/opencascade": "^3.0.0-alpha.4",
-    "@jupytercad/schema": "^3.0.0-alpha.4",
+    "@jupytercad/opencascade": "^3.0.0-alpha.5",
+    "@jupytercad/schema": "^3.0.0-alpha.5",
     "@lumino/coreutils": "^2.0.0",
     "uuid": "^8.3.2"
   },

diff --git a/packages/opencascade/package.json b/packages/opencascade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/opencascade",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "The custom OpenCascade build for JupyterCAD.",
   "keywords": [
     "jupyter",

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/schema",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "A Jupytercad schema package.",
   "keywords": [
     "jupytercad"
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^9.0.9",
-    "@jupyter/ydoc": "^3.0.0-b0",
+    "@jupyter/ydoc": "^3.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/coreutils": "^6.0.0",
     "@jupyterlab/docregistry": "^4.0.0",

diff --git a/packages/schema/src/interfaces.ts b/packages/schema/src/interfaces.ts
@@ -8,7 +8,6 @@ import { IWidgetTracker } from '@jupyterlab/apputils';
 import { IChangedArgs } from '@jupyterlab/coreutils';
 import { DocumentRegistry, IDocumentWidget } from '@jupyterlab/docregistry';
 import { User } from '@jupyterlab/services';
-// import { ReactWidget } from '@jupyterlab/ui-components';
 import { JSONObject } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';
 import { SplitPanel } from '@lumino/widgets';

diff --git a/python/jupytercad/jupytercad/__init__.py b/python/jupytercad/jupytercad/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "3.0.0a4"
+__version__ = "3.0.0a5"
 
 from jupytercad_lab import CadDocument  # noqa
diff --git a/python/jupytercad/pyproject.toml b/python/jupytercad/pyproject.toml
@@ -19,9 +19,9 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "jupytercad_core==3.0.0a4",
-  "jupytercad_lab==3.0.0a4",
-  "jupytercad_app==3.0.0a4",
+  "jupytercad_core==3.0.0a5",
+  "jupytercad_lab==3.0.0a5",
+  "jupytercad_app==3.0.0a5",
 ]
 dynamic = ["version"]
 license = {file = "LICENSE"}

diff --git a/python/jupytercad_app/package.json b/python/jupytercad_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/jupytercad-app",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "A JupyterLab standalone app for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -51,12 +51,12 @@
   "dependencies": {
     "@codemirror/state": "^6.2.0",
     "@codemirror/view": "^6.9.3",
-    "@jupyter/collaboration": "^3.0.0-rc.1",
-    "@jupyter/collaborative-drive": "^3.0.0-rc.1",
-    "@jupyter/docprovider": "^3.0.0-rc.1",
-    "@jupyter/ydoc": "^3.0.0-b0",
-    "@jupytercad/base": "^3.0.0-alpha.4",
-    "@jupytercad/schema": "^3.0.0-alpha.4",
+    "@jupyter/collaboration": "^3.0.0",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/docprovider": "^3.0.0",
+    "@jupyter/ydoc": "^3.0.0",
+    "@jupytercad/base": "^3.0.0-alpha.5",
+    "@jupytercad/schema": "^3.0.0-alpha.5",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/application-extension": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",

diff --git a/python/jupytercad_core/package.json b/python/jupytercad_core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/jupytercad-core",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "JupyterCad core extension",
   "keywords": [
     "jupyter",
@@ -53,10 +53,10 @@
     "build:worker:prod": "webpack --config worker.webpack.config.js --mode=production"
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0-rc.1",
-    "@jupytercad/base": "^3.0.0-alpha.4",
-    "@jupytercad/occ-worker": "^3.0.0-alpha.4",
-    "@jupytercad/schema": "^3.0.0-alpha.4",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupytercad/base": "^3.0.0-alpha.5",
+    "@jupytercad/occ-worker": "^3.0.0-alpha.5",
+    "@jupytercad/schema": "^3.0.0-alpha.5",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/docregistry": "^4.0.0",

diff --git a/python/jupytercad_core/pyproject.toml b/python/jupytercad_core/pyproject.toml
@@ -20,8 +20,8 @@ classifiers = [
 ]
 dependencies = [
   "jupyter_server>=2.0.6,<3",
-  "jupyter_ydoc>=2,<3",
-  "jupyter-collaboration>=3.0.0b8,<4",
+  "jupyter_ydoc>=2,<4",
+  "jupyter-collaboration>=3.0.0,<4",
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 license = {file = "LICENSE"}