address new ruff failures (#360)

* address new ruff failures * proper stacklevel * update precommit * revisit stacklevels
pysal · Apr 9, 2023 · c66cf64 · c66cf64
1 parent af3dca5
commit c66cf64
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,12 @@
 files: 'spopt\/'
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
         language_version: python3
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.257"
+    rev: "v0.0.261"
     hooks:
       - id: ruff
 

diff --git a/spopt/locate/coverage.py b/spopt/locate/coverage.py
@@ -424,11 +424,11 @@ def from_geodataframe(
             "sure deriving centroid from geometries doesn't affect the results."
         )
         if len(dem_type_geom) > 1 or "Point" not in dem_type_geom:
-            warnings.warn(f"Demand{_msg}", UserWarning)
+            warnings.warn(f"Demand{_msg}", UserWarning, stacklevel=2)
             dem = dem.centroid
 
         if len(fac_type_geom) > 1 or "Point" not in fac_type_geom:
-            warnings.warn(f"Facility{_msg}", UserWarning)
+            warnings.warn(f"Facility{_msg}", UserWarning, stacklevel=2)
             fac = fac.centroid
 
         dem_data = np.array([dem.x.to_numpy(), dem.y.to_numpy()]).T
@@ -866,11 +866,11 @@ def from_geodataframe(
             "sure deriving centroid from geometries doesn't affect the results."
         )
         if len(dem_type_geom) > 1 or "Point" not in dem_type_geom:
-            warnings.warn(f"Demand{_msg}", UserWarning)
+            warnings.warn(f"Demand{_msg}", UserWarning, stacklevel=2)
             dem = dem.centroid
 
         if len(fac_type_geom) > 1 or "Point" not in fac_type_geom:
-            warnings.warn(f"Facility{_msg}", UserWarning)
+            warnings.warn(f"Facility{_msg}", UserWarning, stacklevel=2)
             fac = fac.centroid
 
         dem_data = np.array([dem.x.to_numpy(), dem.y.to_numpy()]).T
@@ -1312,11 +1312,11 @@ def from_geodataframe(
             "sure deriving centroid from geometries doesn't affect the results."
         )
         if len(dem_type_geom) > 1 or "Point" not in dem_type_geom:
-            warnings.warn(f"Demand{_msg}", UserWarning)
+            warnings.warn(f"Demand{_msg}", UserWarning, stacklevel=2)
             dem = dem.centroid
 
         if len(fac_type_geom) > 1 or "Point" not in fac_type_geom:
-            warnings.warn(f"Facility{_msg}", UserWarning)
+            warnings.warn(f"Facility{_msg}", UserWarning, stacklevel=2)
             fac = fac.centroid
 
         dem_data = np.array([dem.x.to_numpy(), dem.y.to_numpy()]).T

diff --git a/spopt/locate/p_center.py b/spopt/locate/p_center.py
@@ -335,11 +335,11 @@ def from_geodataframe(
             "sure deriving centroid from geometries doesn't affect the results."
         )
         if len(dem_type_geom) > 1 or "Point" not in dem_type_geom:
-            warnings.warn(f"Demand{_msg}", UserWarning)
+            warnings.warn(f"Demand{_msg}", UserWarning, stacklevel=2)
             dem = dem.centroid
 
         if len(fac_type_geom) > 1 or "Point" not in fac_type_geom:
-            warnings.warn(f"Facility{_msg}", UserWarning)
+            warnings.warn(f"Facility{_msg}", UserWarning, stacklevel=2)
             fac = fac.centroid
 
         dem_data = np.array([dem.x.to_numpy(), dem.y.to_numpy()]).T

diff --git a/spopt/locate/p_dispersion.py b/spopt/locate/p_dispersion.py
@@ -292,6 +292,7 @@ def from_geodataframe(
                     "geometries doesn't affect the results."
                 ),
                 UserWarning,
+                stacklevel=2,
             )
             fac = fac.centroid
 

diff --git a/spopt/locate/p_median.py b/spopt/locate/p_median.py
@@ -391,11 +391,11 @@ def from_geodataframe(
             "sure deriving centroid from geometries doesn't affect the results."
         )
         if len(dem_type_geom) > 1 or "Point" not in dem_type_geom:
-            warnings.warn(f"Demand{_msg}", UserWarning)
+            warnings.warn(f"Demand{_msg}", UserWarning, stacklevel=2)
             dem = dem.centroid
 
         if len(fac_type_geom) > 1 or "Point" not in fac_type_geom:
-            warnings.warn(f"Facility{_msg}", UserWarning)
+            warnings.warn(f"Facility{_msg}", UserWarning, stacklevel=2)
             fac = fac.centroid
 
         dem_data = np.array([dem.x.to_numpy(), dem.y.to_numpy()]).T

diff --git a/spopt/region/skater.py b/spopt/region/skater.py
@@ -57,6 +57,7 @@ def __init__(
                 "Both the `affinity` and `dissimilarity` arguments "
                 "were passed in. Defaulting `dissimilarity`.",
                 UserWarning,
+                stacklevel=3,
             )
             affinity = None
 
@@ -170,7 +171,7 @@ def fit(
             warnings.warn(
                 f"By default, the graph is disconnected! {chosen_warning}",
                 OptimizeWarning,
-                stacklevel=2,
+                stacklevel=3,
             )
             if not ignoring_islands:
                 n_clusters += current_n_subtrees
@@ -214,7 +215,7 @@ def fit(
                         f"{n_clusters - current_n_subtrees} subtrees."
                     ),
                     OptimizeWarning,
-                    stacklevel=2,
+                    stacklevel=3,
                 )
                 self.current_labels_ = current_labels
                 self.minimum_spanning_forest_ = MSF

diff --git a/spopt/region/spenclib/utils.py b/spopt/region/spenclib/utils.py
@@ -15,8 +15,9 @@ def check_weights(W, X=None):
     components, labels = csg.connected_components(graph)
     if components > 1:
         warn(
-            "Spatial affinity matrix is disconnected, and has {} subcomponents."
-            "This will certainly affect the solution output."
+            f"Spatial affinity matrix is disconnected, and has {components} "
+            "subcomponents. This will certainly affect the solution output.",
+            stacklevel=3,
         )
     return W