Skip to content

Commit 4aff080

Browse files
authored
Merge pull request #1335 from compas-dev/import-from-itertools
Import from itertools
2 parents 14a2eed + f302c1d commit 4aff080

File tree

25 files changed

+26
-176
lines changed

25 files changed

+26
-176
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3131
* Changed order of imports according to `isort` and changed line length to `179`.
3232
* Changed use of `compas.geometry.allclose` to `compas.tolerance.TOL.is_allclose`.
3333
* Changed use of `compas.geometry.close` to `compas.tolerance.TOL.is_close`.
34+
* Changed imports of itertools to `compas.itertools` instead of `compas.utilities`.
3435

3536
### Removed
3637

src/compas/datastructures/mesh/duality.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from math import pi
66

7-
from compas.utilities import flatten
7+
from compas.itertools import flatten
88

99
PI2 = 2.0 * pi
1010

src/compas/datastructures/mesh/mesh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
from compas.geometry import vector_average
5454
from compas.itertools import linspace
5555
from compas.itertools import pairwise
56+
from compas.itertools import window
5657
from compas.tolerance import TOL
5758
from compas.topology import breadth_first_traverse
5859
from compas.topology import connected_components
5960
from compas.topology import unify_cycles
60-
from compas.utilities import window
6161

6262
from .duality import mesh_dual
6363
from .operations.collapse import mesh_collapse_edge

src/compas/datastructures/mesh/subdivision.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
from compas.geometry import centroid_points
1010
from compas.geometry import offset_polygon
11+
from compas.itertools import iterable_like
1112
from compas.itertools import pairwise
12-
from compas.utilities import iterable_like
1313

1414

1515
def subd_factory(cls):

src/compas/geometry/_core/predicates_3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from compas.geometry import length_vector
1414
from compas.geometry import normal_polygon
1515
from compas.geometry import subtract_vectors
16+
from compas.itertools import window
1617
from compas.tolerance import TOL
17-
from compas.utilities import window
1818

1919
# =============================================================================
2020
# =============================================================================

src/compas/geometry/interpolation_coons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from compas.geometry import scale_vector
77
from compas.geometry import subtract_vectors
88
from compas.geometry import sum_vectors
9-
from compas.utilities import normalize_values
9+
from compas.itertools import normalize_values
1010

1111

1212
def discrete_coons_patch(ab, bc, dc, ad):

src/compas/geometry/offset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
from compas.geometry import normalize_vector
1313
from compas.geometry import scale_vector
1414
from compas.geometry import subtract_vectors
15+
from compas.itertools import iterable_like
1516
from compas.itertools import pairwise
16-
from compas.utilities import iterable_like
1717

1818

1919
def intersect_lines(l1, l2, tol):

src/compas/geometry/projection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from compas.geometry import matrix_from_parallel_projection
1818
from compas.geometry import matrix_from_perspective_entries
1919
from compas.geometry import matrix_from_perspective_projection
20+
from compas.itertools import flatten
2021
from compas.tolerance import TOL
21-
from compas.utilities import flatten
2222

2323

2424
class Projection(Transformation):

src/compas/geometry/quadmesh_planarize_none.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from compas.geometry import midpoint_point_point
1010
from compas.geometry import project_points_plane
1111
from compas.itertools import pairwise
12-
from compas.utilities import window
12+
from compas.itertools import window
1313

1414

1515
def mesh_flatness(mesh, maxdev=1.0):

src/compas/geometry/reflection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
from compas.geometry import identity_matrix
1919
from compas.geometry import matrix_from_perspective_entries
2020
from compas.geometry import normalize_vector
21+
from compas.itertools import flatten
2122
from compas.tolerance import TOL
22-
from compas.utilities import flatten
2323

2424

2525
class Reflection(Transformation):

0 commit comments

Comments
 (0)