Merge pull request #1335 from compas-dev/import-from-itertools

Import from itertools

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * 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`.
 * Changed use of `compas.geometry.close` to `compas.tolerance.TOL.is_close`.
+* Changed imports of itertools to `compas.itertools` instead of `compas.utilities`.
 
 ### Removed
 

src/compas/datastructures/mesh/duality.py

@@ -4,7 +4,7 @@
 
 from math import pi
 
-from compas.utilities import flatten
+from compas.itertools import flatten
 
 PI2 = 2.0 * pi
 

src/compas/datastructures/mesh/mesh.py

@@ -53,11 +53,11 @@
 from compas.geometry import vector_average
 from compas.itertools import linspace
 from compas.itertools import pairwise
+from compas.itertools import window
 from compas.tolerance import TOL
 from compas.topology import breadth_first_traverse
 from compas.topology import connected_components
 from compas.topology import unify_cycles
-from compas.utilities import window
 
 from .duality import mesh_dual
 from .operations.collapse import mesh_collapse_edge

src/compas/datastructures/mesh/subdivision.py

@@ -8,8 +8,8 @@
 
 from compas.geometry import centroid_points
 from compas.geometry import offset_polygon
+from compas.itertools import iterable_like
 from compas.itertools import pairwise
-from compas.utilities import iterable_like
 
 
 def subd_factory(cls):

src/compas/geometry/_core/predicates_3.py

@@ -13,8 +13,8 @@
 from compas.geometry import length_vector
 from compas.geometry import normal_polygon
 from compas.geometry import subtract_vectors
+from compas.itertools import window
 from compas.tolerance import TOL
-from compas.utilities import window
 
 # =============================================================================
 # =============================================================================

src/compas/geometry/interpolation_coons.py

@@ -6,7 +6,7 @@
 from compas.geometry import scale_vector
 from compas.geometry import subtract_vectors
 from compas.geometry import sum_vectors
-from compas.utilities import normalize_values
+from compas.itertools import normalize_values
 
 
 def discrete_coons_patch(ab, bc, dc, ad):

src/compas/geometry/offset.py

@@ -12,8 +12,8 @@
 from compas.geometry import normalize_vector
 from compas.geometry import scale_vector
 from compas.geometry import subtract_vectors
+from compas.itertools import iterable_like
 from compas.itertools import pairwise
-from compas.utilities import iterable_like
 
 
 def intersect_lines(l1, l2, tol):

src/compas/geometry/projection.py

@@ -17,8 +17,8 @@
 from compas.geometry import matrix_from_parallel_projection
 from compas.geometry import matrix_from_perspective_entries
 from compas.geometry import matrix_from_perspective_projection
+from compas.itertools import flatten
 from compas.tolerance import TOL
-from compas.utilities import flatten
 
 
 class Projection(Transformation):

src/compas/geometry/quadmesh_planarize_none.py

@@ -9,7 +9,7 @@
 from compas.geometry import midpoint_point_point
 from compas.geometry import project_points_plane
 from compas.itertools import pairwise
-from compas.utilities import window
+from compas.itertools import window
 
 
 def mesh_flatness(mesh, maxdev=1.0):

src/compas/geometry/reflection.py

@@ -18,8 +18,8 @@
 from compas.geometry import identity_matrix
 from compas.geometry import matrix_from_perspective_entries
 from compas.geometry import normalize_vector
+from compas.itertools import flatten
 from compas.tolerance import TOL
-from compas.utilities import flatten
 
 
 class Reflection(Transformation):

src/compas/geometry/rotation.py

@@ -23,8 +23,8 @@
 from compas.geometry import matrix_from_frame
 from compas.geometry import matrix_from_quaternion
 from compas.geometry import normalize_vector
+from compas.itertools import flatten
 from compas.tolerance import TOL
-from compas.utilities import flatten
 
 
 class Rotation(Transformation):

src/compas/geometry/scale.py

@@ -17,8 +17,8 @@
 from compas.geometry import matrix_from_scale_factors
 from compas.geometry import matrix_inverse
 from compas.geometry import multiply_matrices
+from compas.itertools import flatten
 from compas.tolerance import TOL
-from compas.utilities import flatten
 
 
 class Scale(Transformation):

src/compas/geometry/shear.py

@@ -15,8 +15,8 @@
 from compas.geometry import decompose_matrix
 from compas.geometry import matrix_from_shear
 from compas.geometry import matrix_from_shear_entries
+from compas.itertools import flatten
 from compas.tolerance import TOL
-from compas.utilities import flatten
 
 
 class Shear(Transformation):

src/compas/geometry/surfaces/nurbs.py

@@ -4,9 +4,9 @@
 
 from compas.geometry import Point
 from compas.itertools import linspace
+from compas.itertools import meshgrid
 from compas.plugins import PluginNotInstalledError
 from compas.plugins import pluggable
-from compas.utilities import meshgrid
 
 from .surface import Surface
 

src/compas/geometry/translation.py

@@ -14,8 +14,8 @@
 from compas.geometry import Transformation
 from compas.geometry import matrix_from_translation
 from compas.geometry import translation_from_matrix
+from compas.itertools import flatten
 from compas.tolerance import TOL
-from compas.utilities import flatten
 
 
 class Translation(Transformation):

src/compas/geometry/trimesh_curvature.py

@@ -5,8 +5,8 @@
 from math import pi
 
 from compas.geometry import angle_points
+from compas.itertools import window
 from compas.plugins import pluggable
-from compas.utilities import window
 
 
 @pluggable(category="trimesh")

src/compas/itertools.py

@@ -123,7 +123,7 @@ def meshgrid(x, y, indexing="xy"):
 
     Examples
     --------
-    >>> from compas.utilities import linspace, meshgrid
+    >>> from compas.itertools import linspace, meshgrid
     >>> x = list(linspace(0, 1, 3))
     >>> y = list(linspace(0, 1, 2))
 
@@ -181,7 +181,7 @@ def linspace(start, stop, num=50):
 
     Examples
     --------
-    >>> from compas.utilities import linspace
+    >>> from compas.itertools import linspace
     >>> list(linspace(0, 1, 3))
     [0.0, 0.5, 1.0]
 

src/compas_rhino/conduits/faces.py

@@ -5,8 +5,8 @@
 from Rhino.Geometry import Point3d
 from System.Drawing.Color import FromArgb
 
+from compas.itertools import iterable_like
 from compas.utilities import is_sequence_of_iterable
-from compas.utilities import iterable_like
 
 from .base import BaseConduit
 

src/compas_rhino/conduits/labels.py

@@ -5,8 +5,8 @@
 from Rhino.Geometry import Point3d
 from System.Drawing.Color import FromArgb
 
+from compas.itertools import iterable_like
 from compas.utilities import is_sequence_of_iterable
-from compas.utilities import iterable_like
 
 from .base import BaseConduit
 

src/compas_rhino/conduits/lines.py

@@ -5,8 +5,8 @@
 from Rhino.Geometry import Point3d
 from System.Drawing.Color import FromArgb
 
+from compas.itertools import iterable_like
 from compas.utilities import is_sequence_of_iterable
-from compas.utilities import iterable_like
 
 from .base import BaseConduit
 

src/compas_rhino/conduits/points.py

@@ -6,8 +6,8 @@
 from Rhino.Geometry import Point3d
 from System.Drawing.Color import FromArgb
 
+from compas.itertools import iterable_like
 from compas.utilities import color_to_rgb
-from compas.utilities import iterable_like
 from compas.utilities.coercing import is_sequence_of_iterable
 
 from .base import BaseConduit

src/compas_rhino/geometry/surfaces/nurbs.py

@@ -9,7 +9,7 @@
 from compas.geometry import NurbsSurface
 from compas.geometry import Point
 from compas.geometry import knots_and_mults_to_knotvector
-from compas.utilities import flatten
+from compas.itertools import flatten
 from compas_rhino.conversions import point_to_compas
 from compas_rhino.conversions import point_to_rhino
 

tests/compas/utilities/test_itertools.py → tests/compas/test_itertools.py

@@ -2,9 +2,9 @@
 import pytest
 
 from compas.datastructures import Mesh
-from compas.utilities import iterable_like
-from compas.utilities import reshape
-from compas.utilities import flatten
+from compas.itertools import iterable_like
+from compas.itertools import reshape
+from compas.itertools import flatten
 from compas.tolerance import TOL