style: fix black formatting and ruff lint (unnecessary generator)

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: lachlangrose

loopstructural/gui/map2loop_tools/fault_topology_widget.py

@@ -174,7 +174,7 @@ def _run_topology(self):
                     # not just the ones map2loop found a relationship for. A fault with
                     # no detected topological relationship is still a real fault and
                     # must not be dropped from the fault topology.
-                    new_faults = set(str(v) for v in gdf['ID'].unique())
+                    new_faults = {str(v) for v in gdf['ID'].unique()}
 
                     # Add new faults; never remove existing ones here, so faults
                     # without a detected relationship (or ones the user added
@@ -209,9 +209,7 @@ def _run_topology(self):
                                 else:
                                     f1 = str(row.iloc[0])
                                     f2 = str(row.iloc[1])
-                                ft.update_fault_relationship(
-                                    f1, f2, FaultRelationshipType.ABUTTING
-                                )
+                                ft.update_fault_relationship(f1, f2, FaultRelationshipType.ABUTTING)
                             except Exception:
                                 pass
 

loopstructural/gui/modelling/model_definition/bounding_box.py

@@ -32,11 +32,11 @@ def __init__(self, parent=None, data_manager=None):
             self.selectFromCurrentLayerButton, "mActionZoomToLayer.svg", "Select from Current Layer"
         )
         self._style_tool_button(
-            self.useCurrentViewExtentButton, "mActionSetToCanvasExtent.svg", "Use Current View Extent"
-        )
-        self._style_tool_button(
-            self.drawOnMapButton, "mActionAddBasicRectangle.svg", "Draw on Map"
+            self.useCurrentViewExtentButton,
+            "mActionSetToCanvasExtent.svg",
+            "Use Current View Extent",
         )
+        self._style_tool_button(self.drawOnMapButton, "mActionAddBasicRectangle.svg", "Draw on Map")
         self.drawOnMapButton.setCheckable(True)
         self.drawOnMapButton.clicked.connect(self.drawOnMap)
         self._draw_extent_tool = None

loopstructural/gui/visualisation/feature_list_widget.py

@@ -56,9 +56,7 @@ def __init__(self, parent=None, *, model_manager=None, viewer=None, data_manager
         self.data_manager = data_manager
 
         # Add buttons
-        self.addBoundingBoxButton = self._make_tool_button(
-            "extents.svg", "Add Model Bounding Box"
-        )
+        self.addBoundingBoxButton = self._make_tool_button("extents.svg", "Add Model Bounding Box")
         self.addFaultSurfacesButton = self._make_custom_icon_tool_button(
             "fault.svg", "Add Fault Surfaces"
         )
@@ -724,7 +722,12 @@ def _extract_line_xy(self, layer) -> Optional[np.ndarray]:
             except Exception:
                 target_crs = None
         source_crs = layer.sourceCrs()
-        if target_crs is not None and target_crs.isValid() and source_crs.isValid() and source_crs != target_crs:
+        if (
+            target_crs is not None
+            and target_crs.isValid()
+            and source_crs.isValid()
+            and source_crs != target_crs
+        ):
             geom = QgsGeometry(geom)
             geom.transform(QgsCoordinateTransform(source_crs, target_crs, QgsProject.instance()))
 

loopstructural/main/m2l_api.py

@@ -98,7 +98,9 @@ def extract_basal_contacts(
     unit_name_col = 'UNITNAME' if 'UNITNAME' in geology.columns else unit_name_field
     if unit_name_col and unit_name_col in geology.columns:
         geology_unit_names = {str(v).strip() for v in geology[unit_name_col].dropna().unique()}
-        stratigraphic_names = {str(name).strip() for name in stratigraphic_order if name is not None}
+        stratigraphic_names = {
+            str(name).strip() for name in stratigraphic_order if name is not None
+        }
         ignored_names = {str(unit).strip() for unit in ignore_units if unit is not None}
         missing_from_column = sorted(geology_unit_names - stratigraphic_names - ignored_names)
         if missing_from_column:

tests/qgis/test_stratigraphic_value_consistency.py

@@ -79,9 +79,7 @@ def test_single_group_three_units(self, manager):
         manager.update_foliation_features()
 
         training_values = self._training_values_by_unit(manager._captured_calls)
-        expected_values = {
-            name: entry['value'] for name, entry in column.get_isovalues().items()
-        }
+        expected_values = {name: entry['value'] for name, entry in column.get_isovalues().items()}
 
         for unit_name in ('oldest', 'middle', 'youngest'):
             assert training_values[unit_name] == pytest.approx(expected_values[unit_name]), (
@@ -107,14 +105,11 @@ def test_two_groups_split_by_unconformity(self, manager):
         manager.update_foliation_features()
 
         training_values = self._training_values_by_unit(manager._captured_calls)
-        expected_values = {
-            name: entry['value'] for name, entry in column.get_isovalues().items()
-        }
+        expected_values = {name: entry['value'] for name, entry in column.get_isovalues().items()}
 
         for unit_name in ('basin_floor', 'basin_fill', 'cover_lower', 'cover_upper'):
             assert training_values[unit_name] == pytest.approx(expected_values[unit_name])
 
-
     def test_undigitised_unit_does_not_shift_later_units_in_group(self, manager):
         """Regression test for a real bug: a unit with no digitised contact
         or orientation data (e.g. a "Top" unit nobody has mapped points for)
@@ -138,9 +133,7 @@ def test_undigitised_unit_does_not_shift_later_units_in_group(self, manager):
         manager.update_foliation_features()
 
         training_values = self._training_values_by_unit(manager._captured_calls)
-        expected_values = {
-            name: entry['value'] for name, entry in column.get_isovalues().items()
-        }
+        expected_values = {name: entry['value'] for name, entry in column.get_isovalues().items()}
 
         for unit_name in ('basin_floor', 'basin_fill'):
             assert training_values[unit_name] == pytest.approx(expected_values[unit_name]), (