Merge branch 'main' into meshobject

Author: Licini

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0-beta.3
+current_version = 2.0.0-beta.4
 message = Bump version to {new_version}
 commit = True
 tag = True

CHANGELOG.md

@@ -9,11 +9,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Removed
+
+## [2.0.0-beta.4] 2024-01-26
+
+### Added
+
 * Added `compas_rhino.objects`.
 * Added `compas_rhino.layers`.
 * Added `compas_rhino.install_with_pip`.
 * Added `before_draw` pluggable to `compas.scene.Scene.draw`.
 * Added `after_draw` pluggable to `compas.scene.Scene.draw`.
+* Added description in tutorial about `compas.scene.context`.
+* Added `compas_blender.data`.
+* Added `compas_blender.collections`.
+* Added `compas_blender.objects`.
+* Added `compas_rhino.ui`.
+* Added `compas_rhino.unload_modules`.
+* Added `compas_ghpython.unload_modules`.
+* Added `compas_ghpython.sets`.
+* Added `compas_ghpython.timer`.
 
 ### Changed
 
@@ -29,6 +46,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed `compas_blender.geometry.curves`.
 * Removed `compas_rhino.utilities.objects`.
 * Removed `compas_rhino.utilities.layers`.
+* Removed `compas_rhino.utilities.constructors`.
+* Removed `compas_rhino.utilities.document`.
+* Removed `compas_rhino.utilities.geometry`.
+* Removed `compas_rhino.utilities.misc`.
+* Removed `compas_blender.utilities.data`.
+* Removed `compas_blender.utilities.collections`.
+* Removed `compas_blender.utilities.objects`.
+* Removed `compas_ghpython.utilities.sets`.
+* Removed `compas_ghpython.utilities.timer`.
 
 ## [2.0.0-beta.3] 2024-01-19
 

docs/api/compas_rhino.layers.rst

@@ -70,6 +70,4 @@ COMPAS geometry and data structures in Rhino, and for basic user inter interacti
 
     compas_rhino.conversions
     compas_rhino.geometry
-    compas_rhino.layers
-    compas_rhino.objects
     compas_rhino.scene

docs/api/compas_rhino.objects.rst

@@ -114,3 +114,31 @@ To use a different scene object as the parent, the parent attribute of the scene
 >>> boxobj = scene.add(box, parent=pointobj)
 >>> boxobj.parent
 PointObject
+
+
+Scene Context
+=============
+
+Depending on where the code is executed, the "scene" will detect the current visualisation context.
+If the code is executed in the Rhino, the scene context will be automatically set as "Rhino". 
+
+>>> from compas.scene import Scene
+>>> from compas.geometry import Box
+>>> scene = Scene()
+>>> scene.context
+Rhino
+
+For every context, the appropriate scene object implementations will be used automatically.
+
+>>> box = Box.from_width_height_depth(1, 1, 1)
+>>> scene.add(box)
+<compas_rhino.scene.BoxObject>
+
+Users can also set the scene context manually:
+
+>>> scene = Scene(context="MyContextName")
+>>> scene.context
+MyContextName
+
+The currently supported contexts are: "Viewer", "Rhino", "Grasshopper", "Blender" and None.
+For working with different contexts please refer to the next section "Tutorial: Working in CAD".

docs/api/index.rst

@@ -22,7 +22,7 @@ def read(*names, **kwargs):
 
 setup(
     name="COMPAS",
-    version="2.0.0-beta.3",
+    version="2.0.0-beta.4",
     description="The COMPAS framework",
     long_description=long_description,
     long_description_content_type="text/markdown",

docs/userguide/basics.visualisation.rst

@@ -21,7 +21,7 @@
 __copyright__ = "Copyright 2014-2022 - ETH Zurich, Copyright 2023 - COMPAS Association"
 __license__ = "MIT License"
 __email__ = "[email protected]"
-__version__ = "2.0.0-beta.3"
+__version__ = "2.0.0-beta.4"
 
 version = LooseVersion(compas.__version__)
 versionstring = version.vstring.split("-")[0]

setup.py

@@ -113,8 +113,8 @@ def is_rhino():
 
 def is_grasshopper():
     try:
-        import Rhino
-        import scriptcontext
+        import Rhino  # noqa : F401
+        import scriptcontext  # noqa : F401
     except ImportError:
         return False
     return not isinstance(scriptcontext.doc, Rhino.RhinoDoc)