Skip to content

Commit

Permalink
Merge branch 'main' into import-from-itertools
Browse files Browse the repository at this point in the history
  • Loading branch information
tomvanmele committed Apr 24, 2024
2 parents 75aaf2d + 14a2eed commit f302c1d
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 19 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Fixed bug in `Mesh.thickened`.
* Fixed various bugs in `compas.geometry.Quaternion`.
* Changed repo config to `pyproject.toml`.
* Fixed broken import in `copas.geometry.trimesh_smoothing_numpy`.
* Changed `RhinoBrep.trimmed` to return single result or raise `BrepTrimmingError` instead of returning a list.
* Changed order of imports according to `isort` and changed line length to `179`.
* Changed use of `compas.geometry.allclose` to `compas.tolerance.TOL.is_allclose`.
Expand All @@ -36,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* Removed `compas.scene.SceneObjectNode`, functionalities merged into `compas.scene.SceneObject`.
* Removed `compas.scene.SceneTree`, functionalities merged into `compas.scene.Scene`.
* Removed default implementation of `compas.geometry.trimesh_geodistance` since nonexistent.

## [2.1.0] 2024-03-01

Expand Down
4 changes: 0 additions & 4 deletions src/compas/geometry/triangulation_delaunay.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from compas.plugins import pluggable


Expand Down
11 changes: 1 addition & 10 deletions src/compas/geometry/trimesh_geodistance.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from compas.plugins import pluggable


Expand Down Expand Up @@ -33,12 +29,7 @@ def trimesh_geodistance(M, source, method="exact"):
>>>
"""
from .trimesh_geodistance_numpy import trimesh_geodesic_distances_numpy

if method == "exact":
raise NotImplementedError

return trimesh_geodesic_distances_numpy(M, [source])
raise NotImplementedError


trimesh_geodistance.__pluggable__ = True
4 changes: 0 additions & 4 deletions src/compas/geometry/trimesh_remeshing.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from compas.plugins import pluggable


Expand Down
2 changes: 1 addition & 1 deletion src/compas/geometry/trimesh_smoothing_numpy.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from numpy import array

from ._algebra import trimesh_cotangent_laplacian_matrix
from .trimesh_matrices_numpy import trimesh_cotangent_laplacian_matrix


def trimesh_smooth_laplacian_cotangent(trimesh, fixed, kmax=10):
Expand Down

0 comments on commit f302c1d

Please sign in to comment.