Merge remote-tracking branch 'compas-dev/main' into main

Author: juney-lee

.bumpversion.cfg

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

CHANGELOG.md

@@ -16,6 +16,64 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 
+## [1.15.0] 2022-03-22
+
+### Added
+
+* Added descriptor support to `compas.colors.Color`.
+* Added descriptor protocol metaclass to `compas.artists.Artist`.
+* Added `compas.artists.colordict.ColorDict` descriptor.
+* Added `allclose` to doctest fixtures.
+* Added `compas.colors.Color.coerce` to construct a color out og hex, RGB1, and RGB255 inputs.
+* Added `compas.datastructures.Network.from_pointcloud`.
+* Added `compas.datastructures.VolMesh.from_meshgrid`.
+* Added `vertices_where`, `vertices_where_predicate`, `edges_where`, `edges_where_predicate` to `compas.datastructures.HalfFace`.
+* Added `faces_where`, `faces_where_predicate`, `cells_where`, `cells_where_predicate` to `compas.datastructures.HalfFace`.
+* Added `VolMeshArtist` to registered Blender artists.
+* Added `3.1` to supported versions for Blender installer.
+* Added `compas.artist.NoArtistContextError`.
+
+### Changed
+
+* Changed `compas.geometry.surfaces.nurbs.from_fill` to accept up to 4 curves as input.
+* Changed `compas_rhino.artists.MeshArtist.draw` to draw the mesh only.
+* Changed `compas_blender.artists.MeshArtist.draw` to draw the mesh only.
+* Changed `compas_ghpython.artists.MeshArtist.draw` to draw the mesh only.
+* Changed `compas_rhino.artists.MeshArtist.draw_vertexlabels` to use the colors of the vertex color dict.
+* Changed `compas_rhino.artists.MeshArtist.draw_edgelabels` to use the colors of the edge color dict.
+* Changed `compas_rhino.artists.MeshArtist.draw_facelabels` to use the colors of the face color dict.
+* Changed `compas_blender.artists.MeshArtist.draw_vertexlabels` to use the colors of the vertex color dict.
+* Changed `compas_blender.artists.MeshArtist.draw_edgelabels` to use the colors of the edge color dict.
+* Changed `compas_blender.artists.MeshArtist.draw_facelabels` to use the colors of the face color dict.
+* Changed `compas_ghpython.artists.MeshArtist.draw_vertexlabels` to use the colors of the vertex color dict.
+* Changed `compas_ghpython.artists.MeshArtist.draw_edgelabels` to use the colors of the edge color dict.
+* Changed `compas_ghpython.artists.MeshArtist.draw_facelabels` to use the colors of the face color dict.
+* Fixed `compas_blender.uninstall`.
+* Changed `planarity` to optional requirement on all platforms.
+* Changed `numba` to optional requirement on all platforms.
+* Changed raw github content path for `compas.get`.
+* Changed `compas.datastructures.Graph.nodes_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Graph.edges_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfedge.vertices_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfedge.edges_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfedge.faces_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.vertices_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.edges_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.faces_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.cells_where` to accept conditions as kwargs.
+* Fixed `compas_blender.artists.VolMeshArtist.draw` and `compas_blender.artists.VolMeshArtist.draw_cells`.
+* Fixed `compas_ghpython.artists.VolMeshArtist.draw` and `compas_ghpython.artists.VolMeshArtist.draw_cells`.
+* Fixed `compas_rhino.artists.VolMeshArtist.draw` and `compas_rhino.artists.VolMeshArtist.draw_cells`.
+* Improved error messages when artist instance cannot be created.
+* Fixed exception when calculating geometry of `compas.datastructures.Part` without features.
+* Fixed bug in `compas_rhino.conversions.RhinoCurve.to_compas`.
+* Fixed bug in `compas_rhino.conversions.RhinoSurface.to_compas`.
+
+### Removed
+
+* Removed `compas.numerical.drx`.
+
+
 ## [1.14.1] 2022-02-16
 
 ### Added
@@ -87,14 +145,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-* Removed `compas.geometry.Collection`
-* Removed `compas.geometry.CollectionNumpy`
-* Removed `compas.geometry.PointCollection`
-* Removed `compas.geometry.PointCollectionNumpy`
-* Removed `compas.interop`
+* Removed `compas.geometry.Collection`.
+* Removed `compas.geometry.CollectionNumpy`.
+* Removed `compas.geometry.PointCollection`.
+* Removed `compas.geometry.PointCollectionNumpy`.
+* Removed `compas.interop`.
 * Removed `numba`; `compas.numerical.drx` will be moved to a dedicated extension package.
 * Removed `ezdxf` (unused).
 * Removed `laspy` (unused).
+* Removed `compas_rhino.artists.MeshArtist.draw_mesh`.
+* Removed `compas_blender.artists.MeshArtist.draw_mesh`.
 
 ## [1.13.3] 2021-12-17
 
@@ -473,6 +533,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `kwargs` to all child classes of `compas.data.Data`.
 * Added grasshopper component for drawing a frame.
 * Added `draw_origin` and `draw_axes`.
+* Added `compas.PY2`.
 
 ### Changed
 

conftest.py

@@ -3,6 +3,8 @@
 import math
 import numpy
 
+from compas.geometry import allclose
+
 
 def pytest_ignore_collect(path):
     if "rhino" in str(path):
@@ -34,3 +36,8 @@ def add_math(doctest_namespace):
 @pytest.fixture(autouse=True)
 def add_np(doctest_namespace):
     doctest_namespace["np"] = numpy
+
+
+@pytest.fixture(autouse=True)
+def add_allclose(doctest_namespace):
+    doctest_namespace["allclose"] = allclose

docs/conf.py

@@ -40,7 +40,7 @@ def patched_m2r2_setup(app):
 copyright = "Block Research Group - ETH Zurich"
 author = "Tom Van Mele"
 
-release = "1.14.1"
+release = "1.15.0"
 version = ".".join(release.split(".")[0:2])
 
 master_doc = "index"
@@ -74,7 +74,7 @@ def patched_m2r2_setup(app):
     "sphinx.ext.graphviz",
     "matplotlib.sphinxext.plot_directive",
     "m2r2",
-    "nbsphinx",
+    # "nbsphinx",
     "sphinx.ext.autodoc.typehints",
     "tabs"
 ]

docs/tutorial/artists/try_artists_mesh.py

@@ -0,0 +1,12 @@
+from compas.datastructures import Mesh
+from compas.artists import Artist
+from compas.colors import Color
+
+mesh = Mesh.from_meshgrid(10, 10)
+
+Artist.clear()
+
+artist = Artist(mesh)
+artist.draw_faces(color={face: Color.pink() for face in mesh.face_sample(size=17)})
+
+Artist.redraw()

docs/tutorial/artists/try_artists_network.py

@@ -0,0 +1,20 @@
+from compas.geometry import Pointcloud
+from compas.datastructures import Network
+from compas.artists import Artist
+from compas.colors import Color
+
+network = Network.from_pointcloud(Pointcloud.from_bounds(8, 5, 3, 53))
+
+node = network.node_sample(size=1)[0]
+nbrs = network.neighbors(node)
+edges = network.connected_edges(node)
+
+Artist.clear()
+
+artist = Artist(network)
+artist.draw(
+    nodecolor={n: Color.pink() for n in [node] + nbrs},
+    edgecolor={e: Color.pink() for e in edges}
+)
+
+Artist.redraw()

docs/tutorial/artists/try_artists_shapes.py

@@ -0,0 +1,27 @@
+import random
+from compas.geometry import Box, Sphere, Cylinder, Cone, Capsule, Torus, Polyhedron
+from compas.geometry import Plane, Circle, Pointcloud
+from compas.geometry import Translation
+from compas.artists import Artist
+from compas.colors import Color
+
+shapes = [
+    Box.from_width_height_depth(1, 1, 1),
+    Sphere([0, 0, 0], 0.3),
+    Cylinder(Circle(Plane([0, 0, 0], [0, 0, 1]), 0.3), 1.0),
+    Cone(Circle(Plane([0, 0, 0], [0, 0, 1]), 0.3), 1.0),
+    Capsule([[0, 0, 0], [1, 0, 0]], 0.2),
+    Torus(Plane([0, 0, 0], [0, 0, 1]), 1.0, 0.3),
+    Polyhedron.from_platonicsolid(12)
+]
+
+cloud = Pointcloud.from_bounds(8, 5, 3, len(shapes))
+
+Artist.clear()
+
+for point, shape in zip(cloud, shapes):
+    shape.transform(Translation.from_vector(point))
+    artist = Artist(shape)
+    artist.draw(color=Color.from_i(random.random()))
+
+Artist.redraw()

docs/tutorial/artists/try_artists_volmesh.py

@@ -0,0 +1,12 @@
+from compas.datastructures import VolMesh
+from compas.artists import Artist
+from compas.colors import Color
+
+mesh = VolMesh.from_meshgrid(dx=10, nx=10)
+
+Artist.clear()
+
+artist = Artist(mesh)
+artist.draw_cells(color={cell: Color.pink() for cell in mesh.cell_sample(size=83)})
+
+Artist.redraw()

requirements-dev.txt

@@ -12,7 +12,7 @@ isort
 m2r2
 nbsphinx
 pydocstyle
-pytest >=3.2
+pytest <7.1
 sphinx_compas_theme >=0.15.18
 sphinx >=3.4
 twine

requirements.txt

@@ -10,10 +10,10 @@ matplotlib >= 2.2, < 3.1; python_version >= '3.5' and python_version <= '3.7' an
 matplotlib >= 3.1; python_version >= '3.8' and sys_platform == 'win32'
 matplotlib >= 2.2; python_version >= '3.5' and sys_platform != 'win32'
 networkx
-numba
+# numba
 numpy >= 1.15.4
 pillow
-planarity ; sys_platform != 'win32'
+# planarity ; sys_platform != 'win32'
 pycollada
 schema
 scipy >= 1.1