Update import statements of linspace and pairwise

ZacZhangzhuo · ZacZhangzhuo · commit 67f7bedb4224 · 2024-03-20T13:42:28.000+01:00
diff --git a/docs/userguide/samples/colors_maps_from-one-color.py b/docs/userguide/samples/colors_maps_from-one-color.py
@@ -8,8 +8,8 @@
 from compas.geometry import Point
 from compas.geometry import Polygon
 from compas.geometry import Translation
-from compas.utilities import linspace
-from compas.utilities import pairwise
+from compas.itertools import linspace
+from compas.itertools import pairwise
 
 n = 1000
 t = 0.3
diff --git a/docs/userguide/samples/colors_maps_from-rgb.py b/docs/userguide/samples/colors_maps_from-rgb.py
@@ -8,8 +8,8 @@
 from compas.geometry import Point
 from compas.geometry import Polygon
 from compas.geometry import Vector
-from compas.utilities import linspace
-from compas.utilities import pairwise
+from compas.itertools import linspace
+from compas.itertools import pairwise
 
 n = 5000
 
diff --git a/docs/userguide/samples/colors_maps_from-rgb_simple.py b/docs/userguide/samples/colors_maps_from-rgb_simple.py
@@ -6,8 +6,8 @@
 from compas.datastructures import Mesh
 from compas.geometry import Point
 from compas.geometry import Polygon
-from compas.utilities import linspace
-from compas.utilities import pairwise
+from compas.itertools import linspace
+from compas.itertools import pairwise
 
 n = 256
 t = 0.3
diff --git a/docs/userguide/samples/colors_maps_from-three-colors.py b/docs/userguide/samples/colors_maps_from-three-colors.py
@@ -7,8 +7,8 @@
 from compas.datastructures import Mesh
 from compas.geometry import Point
 from compas.geometry import Polygon
-from compas.utilities import linspace
-from compas.utilities import pairwise
+from compas.itertools import linspace
+from compas.itertools import pairwise
 
 n = 1000
 t = 0.3
diff --git a/docs/userguide/samples/colors_maps_from-two-colors.py b/docs/userguide/samples/colors_maps_from-two-colors.py
@@ -8,8 +8,8 @@
 from compas.geometry import Point
 from compas.geometry import Polygon
 from compas.geometry import Translation
-from compas.utilities import linspace
-from compas.utilities import pairwise
+from compas.itertools import linspace
+from compas.itertools import pairwise
 
 n = 1000
 t = 0.3
diff --git a/src/compas/colors/colormap.py b/src/compas/colors/colormap.py
@@ -4,7 +4,7 @@
 
 import os
 
-from compas.utilities import linspace
+from compas.itertools import linspace
 
 from .color import Color
 from .mpl_colormap import _magma_data
diff --git a/src/compas/datastructures/cell_network/cell_network.py b/src/compas/datastructures/cell_network/cell_network.py
@@ -34,7 +34,7 @@
 from compas.geometry import subtract_vectors
 from compas.geometry import bounding_box
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 from compas.tolerance import TOL
 
diff --git a/src/compas/datastructures/graph/duality.py b/src/compas/datastructures/graph/duality.py
@@ -4,7 +4,7 @@
 
 from math import pi
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from compas.geometry import angle_vectors
 from compas.geometry import is_ccw_xy
 
diff --git a/src/compas/datastructures/graph/operations/join.py b/src/compas/datastructures/graph/operations/join.py
@@ -3,7 +3,7 @@
 from __future__ import division
 
 from compas.tolerance import TOL
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 def graph_join_edges(graph, key):
diff --git a/src/compas/datastructures/mesh/mesh.py b/src/compas/datastructures/mesh/mesh.py
@@ -51,8 +51,8 @@
 from compas.geometry import oriented_bounding_box
 from compas.geometry import transform_points
 
-from compas.utilities import linspace
-from compas.utilities import pairwise
+from compas.itertools import linspace
+from compas.itertools import pairwise
 from compas.utilities import window
 
 from compas.topology import breadth_first_traverse
diff --git a/src/compas/datastructures/mesh/operations/split.py b/src/compas/datastructures/mesh/operations/split.py
@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import division
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 def mesh_split_edge(mesh, edge, t=0.5, allow_boundary=False):
diff --git a/src/compas/datastructures/mesh/operations/weld.py b/src/compas/datastructures/mesh/operations/weld.py
@@ -5,7 +5,7 @@
 from compas.topology import vertex_adjacency_from_edges
 from compas.topology import connected_components
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 from .substitute import mesh_substitute_vertex_in_faces
 
diff --git a/src/compas/datastructures/mesh/subdivision.py b/src/compas/datastructures/mesh/subdivision.py
@@ -10,7 +10,7 @@
 from compas.geometry import offset_polygon
 
 from compas.utilities import iterable_like
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 def subd_factory(cls):
diff --git a/src/compas/datastructures/volmesh/volmesh.py b/src/compas/datastructures/volmesh/volmesh.py
@@ -36,8 +36,8 @@
 from compas.geometry import transform_points
 from compas.geometry import oriented_bounding_box
 
-from compas.utilities import linspace
-from compas.utilities import pairwise
+from compas.itertools import linspace
+from compas.itertools import pairwise
 
 from compas.tolerance import TOL
 
diff --git a/src/compas/geometry/_core/centroids.py b/src/compas/geometry/_core/centroids.py
@@ -4,7 +4,7 @@
 
 from math import fabs
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 from ._algebra import add_vectors
 from ._algebra import subtract_vectors
diff --git a/src/compas/geometry/_core/distance.py b/src/compas/geometry/_core/distance.py
@@ -5,7 +5,7 @@
 from math import fabs
 from math import sqrt
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from compas.tolerance import TOL
 
 from ._algebra import add_vectors
diff --git a/src/compas/geometry/_core/size.py b/src/compas/geometry/_core/size.py
@@ -4,7 +4,7 @@
 
 from math import fabs
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 from ._algebra import subtract_vectors
 from ._algebra import subtract_vectors_xy
diff --git a/src/compas/geometry/curves/curve.py b/src/compas/geometry/curves/curve.py
@@ -7,7 +7,7 @@
 from compas.geometry import Transformation
 from compas.geometry import Plane
 from compas.geometry import Frame
-from compas.utilities import linspace
+from compas.itertools import linspace
 
 
 @pluggable(category="factories")
diff --git a/src/compas/geometry/curves/polyline.py b/src/compas/geometry/curves/polyline.py
@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import division
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 from compas.geometry import allclose
 from compas.geometry import transform_points
diff --git a/src/compas/geometry/intersections.py b/src/compas/geometry/intersections.py
@@ -7,7 +7,7 @@
 
 from compas.tolerance import TOL
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from compas.plugins import pluggable
 from compas.plugins import PluginNotInstalledError
 
diff --git a/src/compas/geometry/offset.py b/src/compas/geometry/offset.py
@@ -15,7 +15,7 @@
 from compas.data.validators import is_item_iterable
 
 from compas.utilities import iterable_like
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 def intersect_lines(l1, l2, tol):
diff --git a/src/compas/geometry/polygon.py b/src/compas/geometry/polygon.py
@@ -4,7 +4,7 @@
 
 import math
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from compas.geometry import allclose
 from compas.geometry import area_polygon
 from compas.geometry import centroid_polygon
diff --git a/src/compas/geometry/polyhedron.py b/src/compas/geometry/polyhedron.py
@@ -4,7 +4,7 @@
 
 from math import sqrt
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from compas.geometry import transform_points
 from compas.geometry import Polygon
 from compas.geometry import Point
diff --git a/src/compas/geometry/quadmesh_planarize_none.py b/src/compas/geometry/quadmesh_planarize_none.py
@@ -10,7 +10,7 @@
 from compas.geometry import bestfit_plane
 
 from compas.utilities import window
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 def mesh_flatness(mesh, maxdev=1.0):
diff --git a/src/compas/geometry/shapes/cone.py b/src/compas/geometry/shapes/cone.py
@@ -7,7 +7,7 @@
 from math import sin
 from math import sqrt
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from compas.geometry import transform_points
 from compas.geometry import Circle
 from compas.geometry import Plane
diff --git a/src/compas/geometry/surfaces/nurbs.py b/src/compas/geometry/surfaces/nurbs.py
@@ -5,7 +5,7 @@
 from compas.plugins import pluggable
 from compas.plugins import PluginNotInstalledError
 from compas.geometry import Point
-from compas.utilities import linspace
+from compas.itertools import linspace
 from compas.utilities import meshgrid
 
 from .surface import Surface
diff --git a/src/compas/geometry/surfaces/surface.py b/src/compas/geometry/surfaces/surface.py
@@ -9,7 +9,7 @@
 from compas.geometry import Transformation
 from compas.geometry import Point
 from compas.plugins import pluggable
-from compas.utilities import linspace
+from compas.itertools import linspace
 
 
 @pluggable(category="factories")
diff --git a/src/compas/topology/connectivity.py b/src/compas/topology/connectivity.py
@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import division
 
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 def vertex_adjacency_from_edges(edges):
diff --git a/src/compas/topology/orientation.py b/src/compas/topology/orientation.py
@@ -5,7 +5,7 @@
 import random
 from compas.topology import breadth_first_traverse
 from compas.geometry import centroid_points
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 def _closest_faces(vertices, faces, nmax=10, radius=10.0):
diff --git a/src/compas_ghpython/utilities/drawing.py b/src/compas_ghpython/utilities/drawing.py
@@ -23,7 +23,7 @@
 from System.Enum import ToObject
 
 from compas.geometry import centroid_points
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from compas_rhino.utilities.drawing import _face_to_max_quad
 
 try:
diff --git a/src/compas_rhino/conversions/meshes.py b/src/compas_rhino/conversions/meshes.py
@@ -13,7 +13,7 @@
 from compas.colors import Color
 from compas.datastructures import Mesh
 from compas.geometry import centroid_polygon
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 from .geometry import vector_to_compas
 
 
diff --git a/tests/compas/geometry/test_polygon.py b/tests/compas/geometry/test_polygon.py
@@ -4,7 +4,7 @@
 from random import random
 from compas.geometry import Point
 from compas.geometry import Polygon
-from compas.utilities import pairwise
+from compas.itertools import pairwise
 
 
 @pytest.mark.parametrize(
diff --git a/tests/compas/geometry/test_surfaces_cone.py b/tests/compas/geometry/test_surfaces_cone.py
@@ -8,7 +8,7 @@
 from compas.geometry import Frame
 from compas.geometry import ConicalSurface
 from compas.geometry import close
-from compas.utilities import linspace
+from compas.itertools import linspace
 
 
 @pytest.mark.parametrize(
diff --git a/tests/compas/geometry/test_surfaces_cylinder.py b/tests/compas/geometry/test_surfaces_cylinder.py
@@ -8,7 +8,7 @@
 from compas.geometry import Frame
 from compas.geometry import CylindricalSurface
 from compas.geometry import close
-from compas.utilities import linspace
+from compas.itertools import linspace
 
 
 @pytest.mark.parametrize(
diff --git a/tests/compas/geometry/test_surfaces_plane.py b/tests/compas/geometry/test_surfaces_plane.py
@@ -8,7 +8,7 @@
 from compas.geometry import Frame
 from compas.geometry import PlanarSurface
 from compas.geometry import close
-from compas.utilities import linspace
+from compas.itertools import linspace
 
 
 @pytest.mark.parametrize(
diff --git a/tests/compas/geometry/test_surfaces_sphere.py b/tests/compas/geometry/test_surfaces_sphere.py
@@ -3,7 +3,7 @@
 import compas
 from random import random
 
-from compas.utilities import linspace
+from compas.itertools import linspace
 from compas.geometry import Point  # noqa: F401
 from compas.geometry import Vector  # noqa: F401
 from compas.geometry import Frame
diff --git a/tests/compas/geometry/test_surfaces_torus.py b/tests/compas/geometry/test_surfaces_torus.py
@@ -3,7 +3,7 @@
 import compas
 from random import random
 
-from compas.utilities import linspace
+from compas.itertools import linspace
 from compas.geometry import Point  # noqa: F401
 from compas.geometry import Vector  # noqa: F401
 from compas.geometry import Frame
