Merge branch 'main' into install

Author: Licini

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.12.2
+current_version = 1.13.2
 message = Bump version to {new_version}
 commit = True
 tag = True

CHANGELOG.md

@@ -9,9 +9,57 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added `compas_plotters.artists.NetworkArtist.draw_nodelabels`.
+* Added `compas_plotters.artists.NetworkArtist.draw_edgelabels`.
+* Added `compas_plotters.Plotter.fontsize`.
+* Added `INSTALLED_VERSION` variable to `compas_rhino.install` to interally inform rhino version context post-installation steps.
+
+### Changed
+
+* Fixed bug in inheritance of `compas_plotters.artists.NetworkArtist`.
+* Changed `compas_plotters.artists.MeshArtist.draw_edges` to ignore edge direction for assignment of edge colors and widths.
+* Changed `compas_plotters.artists.MeshArtist.draw_vertexlabels` to use `compas_plotters.Plotter.fontsize`.
+* Changed `compas_plotters.artists.MeshArtist.draw_edgelabels` to use `compas_plotters.Plotter.fontsize`.
+* Changed `compas_plotters.artists.MeshArtist.draw_facelabels` to use `compas_plotters.Plotter.fontsize`.
+
+### Removed
+
+
+## [1.13.2] 2021-12-11
+
+### Added
+
+* Added `compas_ghpython.fetch_ghio_lib` to simplify the loading of Grasshopper's IO library for extension developers.
+
+### Changed
+
+### Removed
+
+
+## [1.13.1] 2021-12-11
+
+### Added
+
+### Changed
+
+* Fixed bug in `Grasshopper` plugin path on Windows.
+* Fixed bug in `Grasshopper` `UserObjects` uninstall.
+
+### Removed
+
+
+## [1.13.0] 2021-12-10
+
+### Added
+
 * Added `compas_rhino.DEFAULT_VERSION`.
 * Added `clean` option to `compas_rhino.install` to remove existing symlinks if they cannot be imported from the current environment.
-* Added `INSTALLED_VERSION` variable to `compas_rhino.install` to interally inform rhino version context post-installation steps.
+* Added basic implementation of `compas.datastructures.Assembly`.
+* Added `compas.is_grasshopper`.
+* Added `compas.GH`.
+* Added `compas.artists.Artist.CONTEXT`.
+* Added `compas.artists.Artist.AVAILABLE_CONTEXTS`.
+* Added `compas.artists.artist.register_artists` pluggable.
 
 ### Changed
 
@@ -20,15 +68,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed error in parameter list of `compas_rhino.geometry.curves.new_nurbscurve`.
 * Fixed error in parameter list of `compas_rhino.geometry.curves.new_nurbscurve_from_interpolation`.
 * Fixed error in parameter list of `compas_rhino.geometry.curves.new_nurbscurve_from_step`.
-
 * Changed `compas_rhino.install` to remove broken symlinks.
 * Changed `compas_rhino.install` to reinstall broken symlinks if they can be imported from the current environment.
 * Changed `compas_rhino.uninstall` to remove broken symlinks.
 * Changed `compas_rhino.install_plugin` to remove broken symlinks.
 * Changed default Rhino version for installation to `7.0`.
+* Fixed bug in `compas_ghpython` related to importing `Grasshopper` prematurely.
+* Changed `compas.artists.Artist.ITEM_ARTIST` to context-based dict.
+* Changed `compas_rhino.__init__.py` functions.
+* Changed `compas_ghpython.__init__.py` functions.
+* Renamed `compas_ghpython.get_grasshopper_plugin_path` to `compas_ghpython.get_grasshopper_managedplugin_path`.
 
 ### Removed
 
+* Removed `compas.artists.artist.new_artist` pluggable.
+
 
 ## [1.12.2] 2021-11-30
 
@@ -242,6 +296,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas_rhino.geometry.RhinoCylinder`.
 * Added `compas_rhino.geometry.RhinoPolyline`.
 * Added `compas_rhino.geometry.RhinoSphere`.
+* Added basic implementation of `compas.datastructures.Assembly`.
 * Added `meshes` method to artists of `compas.robots.RobotModel`.
 * Added `FrameArtist` class to `compas_blender`.
 

docs/conf.py

@@ -36,7 +36,7 @@ def patched_m2r2_setup(app):
 copyright = "Block Research Group - ETH Zurich"
 author = "Tom Van Mele"
 
-release = "1.12.2"
+release = "1.13.2"
 version = ".".join(release.split(".")[0:2])
 
 master_doc = "index"

docs/tutorial/assembly.rst

@@ -0,0 +1,37 @@
+**********
+Assemblies
+**********
+
+.. rst-class:: lead
+
+The :class:`Assembly` data structure provides functionality for modelling and managing
+the connections between the individual components of an ... assembly.
+Each component is either a part defined by geometrical objects, or another assembly.
+
+
+Basic Usage
+===========
+
+.. code-block:: python
+
+    from compas.datastructures import Part
+    from compas.datastructures import Assembly
+    from compas.geometry import Box
+
+    assembly = Assembly()
+
+
+Find Parts
+==========
+
+.. code-block:: python
+
+    pass
+
+
+Access Data
+===========
+
+.. code-block:: python
+
+    pass

docs/tutorial/assembly_blocks.py

@@ -0,0 +1,36 @@
+from math import radians
+
+from compas.datastructures import Assembly
+from compas.datastructures import Part
+from compas.geometry import Box
+from compas.geometry import Cylinder
+from compas.geometry import Circle
+from compas.geometry import Plane
+from compas.geometry import Translation
+from compas.geometry import Rotation
+from compas.geometry import Frame
+
+from compas_view2.app import App
+
+assembly = Assembly()
+
+a = Part(name='A',
+         geometry=Box.from_width_height_depth(1, 1, 1))
+
+b = Part(name='B',
+         frame=Frame([0, 0, 1], [1, 0, 0], [0, 1, 0]),
+         shape=Box.from_width_height_depth(1, 1, 1),
+         features=[(Cylinder(Circle(Plane.worldXY(), 0.2), 1.0), 'difference')])
+
+b.transform(Rotation.from_axis_and_angle([0, 0, 1], radians(45)))
+b.transform(Translation.from_vector([0, 0, 1]))
+
+assembly.add_part(a)
+assembly.add_part(b)
+
+assembly.add_connection(a, b)
+
+viewer = App()
+viewer.add(b.geometry)
+viewer.add(b.frame)
+viewer.show()

docs/tutorial/assembly_robot.py

@@ -25,7 +25,7 @@ def read(*names, **kwargs):
 
 setup(
     name='COMPAS',
-    version='1.12.2',
+    version='1.13.2',
     description='The COMPAS framework',
     long_description=long_description,
     long_description_content_type='text/markdown',

docs/tutorial/assembly_splines.py

@@ -21,57 +21,6 @@
     compas.topology
     compas.utilities
 
-Utility functions
-=================
-
-JSON handling
--------------
-
-.. autofunction:: json_dump
-
-.. autofunction:: json_dumps
-
-.. autofunction:: json_load
-
-.. autofunction:: json_loads
-
-Precision
----------
-
-.. autofunction:: set_precision
-
-.. autodata:: PRECISION
-
-Execution context
------------------
-
-.. autofunction:: is_windows
-
-.. autofunction:: is_linux
-
-.. autofunction:: is_osx
-
-.. autofunction:: is_mono
-
-.. autofunction:: is_ironpython
-
-.. autofunction:: is_rhino
-
-.. autofunction:: is_blender
-
-.. autodata:: WINDOWS
-
-.. autodata:: LINUX
-
-.. autodata:: OSX
-
-.. autodata:: MONO
-
-.. autodata:: IPY
-
-.. autodata:: RHINO
-
-.. autodata:: BLENDER
 
 """
 from __future__ import print_function
@@ -82,7 +31,7 @@
 from distutils.version import LooseVersion
 
 import compas._os
-from compas._os import is_windows, is_linux, is_osx, is_mono, is_ironpython, is_rhino, is_blender
+from compas._os import is_windows, is_linux, is_osx, is_mono, is_ironpython, is_rhino, is_blender, is_grasshopper  # noqa: F401
 from compas.data import json_dump, json_dumps, json_load, json_loads
 
 
@@ -91,7 +40,7 @@
 __license__ = 'MIT License'
 __email__ = '[email protected]'
 
-__version__ = '1.12.2'
+__version__ = '1.13.2'
 
 version = LooseVersion(compas.__version__)
 versionstring = version.vstring.split('-')[0]

setup.py

@@ -37,7 +37,8 @@ class NotADirectoryError(Exception):
     'is_mono',
     'is_ironpython',
     'is_rhino',
-    'is_blender'
+    'is_blender',
+    'is_grasshopper'
 ]
 
 
@@ -100,17 +101,24 @@ def is_rhino():
         import Rhino  # noqa : F401
     except ImportError:
         return False
-    else:
-        return True
+    return True
+
+
+def is_grasshopper():
+    try:
+        import Rhino
+        import scriptcontext
+    except ImportError:
+        return False
+    return not isinstance(scriptcontext.doc, Rhino.RhinoDoc)
 
 
 def is_blender():
     try:
         import bpy  # noqa : F401
     except ImportError:
         return False
-    else:
-        return True
+    return True
 
 
 if is_windows():