style: fix lints and format

Author: nialov

docs_src/conf.py

@@ -14,12 +14,12 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
-import os
 import sys
 from importlib import import_module
+from pathlib import Path
 
-sys.path.insert(0, os.path.abspath(".."))
-sys.path.insert(0, os.path.abspath("."))
+sys.path.insert(0, Path("..").resolve().as_posix())
+sys.path.insert(0, Path().resolve().as_posix())
 
 # -- Project information -----------------------------------------------------
 

tests/__init__.py

@@ -9,6 +9,7 @@
     # Value of "0" means it is NOT disabled
     os.environ["FRACTOPO_DISABLE_CACHE"] = "1"
 
+import contextlib
 import logging
 import sys
 from functools import lru_cache, wraps
@@ -1675,14 +1676,10 @@ def get_all_errors():
     )
     all_errs = []
     for err in all_error_types:
-        try:
+        with contextlib.suppress(KeyError):
             all_errs.extend(generate_known_params(err, false_positive=False))
-        except KeyError:
-            pass
-        try:
+        with contextlib.suppress(KeyError):
             all_errs.extend(generate_known_params(err, false_positive=True))
-        except KeyError:
-            pass
 
     assert len(all_errs) > 0
     return all_errs

tests/analysis/test_network.py

@@ -242,7 +242,7 @@ def test_network(
 
 
 @tests.plotting_test
-def network_extensive_testing(
+def network_extensive_testing(  # noqa: PLR0915
     network: Network,
     traces: gpd.GeoDataFrame,
     area: gpd.GeoDataFrame,
@@ -420,7 +420,7 @@ def test_network_circular_target_area(trace_gdf, area_gdf, name, data_regression
     )
 
     # test both traces and branches for right boundary_intersect_counts
-    for boundary_intersect_count, gdf, name in zip(
+    for boundary_intersect_count, gdf, type_name in zip(
         (
             # network_circular.trace_boundary_intersect_count,
             # network_circular.branch_boundary_intersect_count,
@@ -435,8 +435,8 @@ def test_network_circular_target_area(trace_gdf, area_gdf, name, data_regression
         assert sum(boundary_intersect_count.values()) == gdf.shape[0]
         assert sum(gdf.geometry.intersects(area_gdf.geometry.iloc[0].boundary)) == sum(
             (
-                boundary_intersect_count[f"{name} Boundary 1 Intersect Count"],
-                boundary_intersect_count[f"{name} Boundary 2 Intersect Count"],
+                boundary_intersect_count[f"{type_name} Boundary 1 Intersect Count"],
+                boundary_intersect_count[f"{type_name} Boundary 2 Intersect Count"],
             )
         )
 

tests/analysis/test_subsampling.py

@@ -25,10 +25,9 @@ def test_aggregate_chosen(
     for value in result.values():
         assert isinstance(value, value_type)
 
-    for col in assumed_results:
+    for col, assumed_result_value in assumed_results.items():
         assert col in result
         result_value = result[col]
-        assumed_result_value = assumed_results[col]
         if isinstance(result_value, str):
             assert result_value == assumed_result_value
         else:

tests/branches_and_nodes/test_branches_and_nodes.py

@@ -2,6 +2,7 @@
 Tests for branch and node determination.
 """
 
+import contextlib
 from typing import List
 
 import geopandas as gpd
@@ -140,13 +141,11 @@ def test_crop_to_target_area(keep_column_data: bool):
         valid_areas_geoseries,
     )
     result = None
-    try:
+    with contextlib.suppress(TypeError):
         result = general.crop_to_target_areas(
             invalid_geoseries,
             invalid_areas_geoseries,
         )
-    except TypeError:
-        pass
     assert result is None
     assert isinstance(valid_result, (gpd.GeoDataFrame, gpd.GeoSeries))
     assert valid_geoseries.geometry.length.mean() > valid_result.geometry.length.mean()

tests/test_general.py

@@ -25,10 +25,7 @@ def test_match_crs(first, second, same: bool, from_first: bool, is_none: bool):
     """
     Test match_crs with pytest params.
     """
-    if from_first:
-        original_crs = first.crs
-    else:
-        original_crs = second.crs
+    original_crs = first.crs if from_first else second.crs
     first_matched, second_matched = general.match_crs(first, second)
     if same:
         assert first_matched.crs == original_crs