Merge pull request #188 from ljwolf/v2.4.1

add pygeos-tolerant fails for the module

esda/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.4.0"
+__version__ = "2.4.1"
 """
 :mod:`esda` --- Exploratory Spatial Data Analysis
 =================================================

esda/map_comparison.py

@@ -1,6 +1,11 @@
-import numpy, pygeos, pandas, geopandas
+import numpy, pandas
 from scipy.special import entr
 
+try:
+    import pygeos
+except (ImportError, ModuleNotFoundError):
+    pass  # gets handled in the _cast function.
+
 # from nowosad and stepinski
 # https://doi.org/10.1080/13658816.2018.1511794
 
@@ -21,6 +26,13 @@ def _cast(collection):
     """
     Cast a collection to a pygeos geometry array.
     """
+    try:
+        import pygeos, geopandas
+    except (ImportError, ModuleNotFoundError) as exception:
+        raise type(exception)(
+            "pygeos and geopandas are required for map comparison statistics."
+        )
+
     if isinstance(collection, (geopandas.GeoSeries, geopandas.GeoDataFrame)):
         return collection.geometry.values.data.squeeze()
     elif pygeos.is_geometry(collection).all():

esda/shape.py

@@ -1,13 +1,24 @@
-import pygeos
-import geopandas, pandas
 import numpy
-from numba import njit, prange
+import pandas
+
+try:
+    import pygeos
+except (ImportError, ModuleNotFoundError):
+    pass  # gets handled at the _cast level.
+
+from .crand import njit, prange
+
 
 # -------------------- UTILITIES --------------------#
 def _cast(collection):
     """
     Cast a collection to a pygeos geometry array.
     """
+    try:
+        import pygeos, geopandas
+    except (ImportError, ModuleNotFoundError) as exception:
+        raise type(exception)("pygeos and geopandas are required for shape statistics.")
+
     if isinstance(collection, (geopandas.GeoSeries, geopandas.GeoDataFrame)):
         return collection.geometry.values.data.squeeze()
     elif pygeos.is_geometry(collection).all():