resolve #609 (#796)

Author: jGaboardi

libpysal/cg/alpha_shapes.py

@@ -11,6 +11,7 @@
 
 import numpy as np
 import scipy.spatial as spat
+import shapely
 from scipy import sparse
 
 from ..common import HAS_JIT, jit, requires
@@ -22,13 +23,6 @@
         "Numba not imported, so alpha shape construction may be slower than expected."
     )
 
-try:
-    import shapely
-
-    HAS_SHAPELY = True
-except (ModuleNotFoundError, AssertionError):
-    HAS_SHAPELY = False
-
 
 EPS = np.finfo(float).eps
 
@@ -464,10 +458,7 @@ def _valid_hull(geoms, points):
     if geoms.shape[0] != 1:
         return False
     # if any (xys) points do not intersect the polygon
-    if HAS_SHAPELY:
-        return shapely.intersects(geoms[0], points).all()
-    else:
-        return all(point.intersects(geoms[0]) for point in points)
+    return shapely.intersects(geoms[0], points).all()
 
 
 @requires("geopandas", "shapely")
@@ -564,7 +555,7 @@ def alpha_shape_auto(
     triangles = triangulation.simplices[radii_sorted_i][::-1]
     radii = radii[radii_sorted_i][::-1]
     geoms_prev = _alpha_geoms((1 / radii.max()) - EPS, triangles, radii, xys)
-    points = shapely.points(xys) if HAS_SHAPELY else [geom.Point(pnt) for pnt in xys]
+    points = shapely.points(xys)
     if verbose:
         print("Step set to %i" % step)
     for i in range(0, len(radii), step):

libpysal/weights/util.py

@@ -1,3 +1,5 @@
+# ruff: noqa: N802, N803
+
 import copy
 import numbers
 import os
@@ -6,12 +8,11 @@
 from warnings import warn
 
 import numpy as np
-
-# ruff: noqa: N802, N803
 import scipy
 import scipy.spatial
 from scipy import sparse
 from scipy.spatial import KDTree
+from shapely.geometry.base import BaseGeometry
 
 from ..common import requires
 from ..io.fileio import FileIO
@@ -24,12 +25,6 @@
 except ImportError:
     warn("geopandas not available. Some functionality will be disabled.", stacklevel=2)
 
-try:
-    from shapely.geometry.base import BaseGeometry
-
-    HAS_SHAPELY = True
-except ImportError:
-    HAS_SHAPELY = False
 
 __all__ = [
     "lat2W",
@@ -1045,17 +1040,14 @@ def get_points_array(iterable):
     """
     first_choice, backup = tee(iterable)
     try:
-        if HAS_SHAPELY:
-            data = np.vstack(
-                [
-                    np.array(shape.centroid.coords)[0]
-                    if isinstance(shape, BaseGeometry)
-                    else np.array(shape.centroid)
-                    for shape in first_choice
-                ]
-            )
-        else:
-            data = np.vstack([np.array(shape.centroid) for shape in first_choice])
+        data = np.vstack(
+            [
+                np.array(shape.centroid.coords)[0]
+                if isinstance(shape, BaseGeometry)
+                else np.array(shape.centroid)
+                for shape in first_choice
+            ]
+        )
     except AttributeError:
         data = np.vstack(list(backup))
     return data