chore: downgrading ruff

lachlangrose · lachlangrose · commit f0ce0b62574c · 2026-08-03T15:48:54.000+09:30
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install black ruff
+          pip install black "ruff==0.15.22"
       - name: Autoformat with black
         run: |
           black .
diff --git a/loopstructural/__about__.py b/loopstructural/__about__.py
@@ -55,7 +55,7 @@ def plugin_metadata_as_dict() -> dict:
         config.read(PLG_METADATA_FILE.resolve(), encoding="UTF-8")
         return {s: dict(config.items(s)) for s in config.sections()}
     else:
-        raise IOError("Plugin metadata.txt not found at: %s" % PLG_METADATA_FILE)
+        raise OSError("Plugin metadata.txt not found at: %s" % PLG_METADATA_FILE)
 
 
 # ############################################################################
@@ -66,7 +66,7 @@ def plugin_metadata_as_dict() -> dict:
 __plugin_md__: dict = plugin_metadata_as_dict()
 
 __author__: str = __plugin_md__.get("general").get("author")
-__copyright__: str = "2024 - {0}, {1}".format(date.today().year, __author__)
+__copyright__: str = f"2024 - {date.today().year}, {__author__}"
 __email__: str = __plugin_md__.get("general").get("email")
 __icon_path__: Path = DIR_PLUGIN_ROOT.resolve() / __plugin_md__.get("general").get("icon")
 __keywords__: list = [
diff --git a/loopstructural/debug_manager.py b/loopstructural/debug_manager.py
@@ -245,13 +245,13 @@ def log_params(self, context_label: str, params: Any):
         """
         try:
             self.plugin.log(
-                message=f"[map2loop] {context_label} parameters: {str(params)}",
+                message=f"[map2loop] {context_label} parameters: {params!s}",
                 log_level=0,
             )
         except Exception as err:
             self.plugin.log(
                 message=(
-                    f"[map2loop] {context_label} parameters (stringified due to {err}): {str(params)}"
+                    f"[map2loop] {context_label} parameters (stringified due to {err}): {params!s}"
                 ),
                 log_level=0,
             )
diff --git a/loopstructural/gui/data_conversion/configuration.py b/loopstructural/gui/data_conversion/configuration.py
@@ -2,8 +2,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable, MutableMapping
 from copy import deepcopy
-from typing import Any, Dict, Iterable, MutableMapping
+from typing import Any, Dict
 
 
 class Config:
diff --git a/loopstructural/gui/data_conversion/data_conversion_widget.py b/loopstructural/gui/data_conversion/data_conversion_widget.py
@@ -4,8 +4,9 @@
 
 import os
 import re
+from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
-from typing import Any, Dict, Iterable, List, Mapping, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 from LoopDataConverter import Datatype, InputData, LoopConverter, SurveyName
 from qgis.core import QgsMapLayerProxyModel, QgsProject, QgsVectorLayer
diff --git a/loopstructural/gui/dlg_settings.py b/loopstructural/gui/dlg_settings.py
@@ -30,7 +30,7 @@
 # ########## Globals ###############
 # ##################################
 
-FORM_CLASS, _ = uic.loadUiType(Path(__file__).parent / "{}.ui".format(Path(__file__).stem))
+FORM_CLASS, _ = uic.loadUiType(Path(__file__).parent / f"{Path(__file__).stem}.ui")
 
 
 # ############################################################################
@@ -48,7 +48,7 @@ def __init__(self, parent):
 
         # load UI and set objectName
         self.setupUi(self)
-        self.setObjectName("mOptionsPage{}".format(__title__))
+        self.setObjectName(f"mOptionsPage{__title__}")
 
         _report_context_message = quote(
             "> Reported from plugin settings\n\n"
diff --git a/loopstructural/gui/map2loop_tools/basal_contacts_widget.py b/loopstructural/gui/map2loop_tools/basal_contacts_widget.py
@@ -277,11 +277,11 @@ def set_parameters(self, params):
         params : dict
             Dictionary of parameters to set.
         """
-        if 'geology_layer' in params and params['geology_layer']:
+        if params.get('geology_layer'):
             self.geologyLayerComboBox.setLayer(params['geology_layer'])
-        if 'faults_layer' in params and params['faults_layer']:
+        if params.get('faults_layer'):
             self.faultsLayerComboBox.setLayer(params['faults_layer'])
-        if 'ignore_units' in params and params['ignore_units']:
+        if params.get('ignore_units'):
             self.ignoreUnitsLineEdit.setText(', '.join(params['ignore_units']))
         if 'all_contacts' in params:
             self.allContactsCheckBox.setChecked(params['all_contacts'])
@@ -310,7 +310,7 @@ def _is_null_like(v):
                 if v is None:
                     return True
                 # PyQGIS QVariant null check
-                if hasattr(v, "isNull") and callable(getattr(v, "isNull")) and v.isNull():
+                if hasattr(v, "isNull") and callable(v.isNull) and v.isNull():
                     return True
                 # Empty strings or literal "NULL" (case-insensitive)
                 if isinstance(v, str):
diff --git a/loopstructural/gui/map2loop_tools/paint_stratigraphic_order_widget.py b/loopstructural/gui/map2loop_tools/paint_stratigraphic_order_widget.py
@@ -40,7 +40,6 @@ def __init__(self, parent=None, data_manager=None, debug_manager=None):
         try:
             self.geologyLayerComboBox.setFilters(QgsMapLayerProxyModel.PolygonLayer)
             # stratigraphic column layer removed from UI
-            pass
         except Exception:
             # If QGIS isn't available, skip filter setup
             pass
@@ -60,7 +59,6 @@ def __init__(self, parent=None, data_manager=None, debug_manager=None):
             if self._debug.is_debug():
                 raise e
             # if QGIS unavailable, leave empty
-            pass
 
         # Default: no duplication
         try:
@@ -132,7 +130,6 @@ def _setup_field_combo_boxes(self):
         """Set up field combo boxes based on current layers."""
         self._on_geology_layer_changed()
         # stratigraphic column layer removed from UI
-        pass
 
     def _on_geology_layer_changed(self):
         """Update unit name field combo box when geology layer changes."""
diff --git a/loopstructural/gui/map2loop_tools/sampler_widget.py b/loopstructural/gui/map2loop_tools/sampler_widget.py
@@ -190,7 +190,6 @@ def _on_spatial_layer_changed(self):
                     self.samplerTypeComboBox.setCurrentIndex(idx)
                 except Exception as e:
                     print(e)
-                    pass
                 self.samplerTypeComboBox.setEnabled(False)
                 self.runButton.setEnabled(True)
             elif geom_type == QgsWkbTypes.LineGeometry:
@@ -200,7 +199,6 @@ def _on_spatial_layer_changed(self):
                     self.samplerTypeComboBox.setCurrentIndex(idx)
                 except Exception as e:
                     print(e)
-                    pass
                 self.samplerTypeComboBox.setEnabled(False)
                 self.runButton.setEnabled(False)
             else:
@@ -372,7 +370,7 @@ def _run_sampler(self):
                 )
             if PlgOptionsManager.get_debug_mode():
                 raise e
-            QMessageBox.critical(self, "Error", f"An error occurred: {str(e)}")
+            QMessageBox.critical(self, "Error", f"An error occurred: {e!s}")
             return False
 
     def get_parameters(self):
@@ -402,11 +400,11 @@ def set_parameters(self, params):
         """
         if 'sampler_type' in params:
             self.samplerTypeComboBox.setCurrentIndex(params['sampler_type'])
-        if 'dtm_layer' in params and params['dtm_layer']:
+        if params.get('dtm_layer'):
             self.dtmLayerComboBox.setLayer(params['dtm_layer'])
-        if 'geology_layer' in params and params['geology_layer']:
+        if params.get('geology_layer'):
             self.geologyLayerComboBox.setLayer(params['geology_layer'])
-        if 'spatial_data_layer' in params and params['spatial_data_layer']:
+        if params.get('spatial_data_layer'):
             self.spatialDataLayerComboBox.setLayer(params['spatial_data_layer'])
         if 'decimation' in params:
             self.decimationSpinBox.setValue(params['decimation'])
diff --git a/loopstructural/gui/map2loop_tools/sorter_widget.py b/loopstructural/gui/map2loop_tools/sorter_widget.py
@@ -442,7 +442,7 @@ def _run_sorter(self):
                 )
             if PlgOptionsManager.get_debug_mode():
                 raise e
-            QMessageBox.critical(self, "Error", f"An error occurred: {str(e)}")
+            QMessageBox.critical(self, "Error", f"An error occurred: {e!s}")
             return False
 
     def get_parameters(self):
@@ -484,7 +484,7 @@ def set_parameters(self, params):
         """
         if 'sorting_algorithm' in params:
             self.sortingAlgorithmComboBox.setCurrentIndex(params['sorting_algorithm'])
-        if 'geology_layer' in params and params['geology_layer']:
+        if params.get('geology_layer'):
             self.geologyLayerComboBox.setLayer(params['geology_layer'])
-        if 'contacts_layer' in params and params['contacts_layer']:
+        if params.get('contacts_layer'):
             self.contactsLayerComboBox.setLayer(params['contacts_layer'])
diff --git a/loopstructural/gui/map2loop_tools/thickness_calculator_widget.py b/loopstructural/gui/map2loop_tools/thickness_calculator_widget.py
@@ -443,7 +443,7 @@ def _run_calculator(self):
                 )
             if PlgOptionsManager.get_debug_mode():
                 raise e
-            QMessageBox.critical(self, "Error", f"An error occurred: {str(e)}")
+            QMessageBox.critical(self, "Error", f"An error occurred: {e!s}")
             return False
 
     def get_parameters(self):
diff --git a/loopstructural/gui/modelling/fault_graph/fault_graph.py b/loopstructural/gui/modelling/fault_graph/fault_graph.py
@@ -67,7 +67,6 @@ def mousePressEvent(self, event):
     def paint(self, painter, option, widget=None):
         """Delegate paint to the shape_item."""
         # No custom painting is needed since the shape_item handles rendering.
-        pass
 
     def add_edge(self, edge):
         self.edges.append(edge)
diff --git a/loopstructural/gui/modelling/geological_model_tab/bounding_box_widget.py b/loopstructural/gui/modelling/geological_model_tab/bounding_box_widget.py
@@ -93,7 +93,7 @@ def __init__(self, parent=None, *, model_manager=None, data_manager=None):
                 self.nsteps_z.setValue(1)
             try:
                 if getattr(bb, 'nelements', None) is not None:
-                    self.nelements.setValue(int(getattr(bb, 'nelements')))
+                    self.nelements.setValue(int(bb.nelements))
             except Exception:
                 self.nelements.setValue(getattr(bb, 'nelements', 1000) if bb is not None else 1000)
         else:
@@ -124,7 +124,7 @@ def _get_bounding_box(self):
                 if hasattr(self.data_manager, 'get_bounding_box'):
                     bounding_box = self.data_manager.get_bounding_box()
                 elif hasattr(self.data_manager, 'bounding_box'):
-                    bounding_box = getattr(self.data_manager, 'bounding_box')
+                    bounding_box = self.data_manager.bounding_box
             except Exception:
                 logger.debug('Failed to get bounding box from data_manager', exc_info=True)
                 bounding_box = None
@@ -200,10 +200,10 @@ def _on_bounding_box_updated(self, bounding_box):
         try:
             if getattr(bounding_box, 'nelements', None) is not None:
                 try:
-                    self.nelements.setValue(int(getattr(bounding_box, 'nelements')))
+                    self.nelements.setValue(int(bounding_box.nelements))
                 except Exception:
                     try:
-                        self.nelements.setValue(getattr(bounding_box, 'nelements'))
+                        self.nelements.setValue(bounding_box.nelements)
                     except Exception:
                         logger.debug('Could not set nelements', exc_info=True)
             if getattr(bounding_box, 'nsteps', None) is not None:
diff --git a/loopstructural/gui/modelling/geological_model_tab/feature_details_panel.py b/loopstructural/gui/modelling/geological_model_tab/feature_details_panel.py
@@ -315,10 +315,10 @@ def _on_bounding_box_updated(self, bounding_box):
                 self, 'bb_nelements_spinbox'
             ):
                 try:
-                    self.bb_nelements_spinbox.setValue(int(getattr(bounding_box, 'nelements')))
+                    self.bb_nelements_spinbox.setValue(int(bounding_box.nelements))
                 except Exception:
                     try:
-                        self.bb_nelements_spinbox.setValue(getattr(bounding_box, 'nelements'))
+                        self.bb_nelements_spinbox.setValue(bounding_box.nelements)
                     except Exception:
                         logger.debug(
                             'Could not set nelements spinbox from bounding_box', exc_info=True
@@ -604,7 +604,6 @@ def schedule_rebuild(self, delay_ms: int = 500):
             self._rebuild_timer.start()
         except Exception:
             logger.debug('Failed to schedule debounced rebuild', exc_info=True)
-            pass
 
     def _perform_rebuild(self):
         """Perform the actual build operation when the debounce timer fires."""
diff --git a/loopstructural/gui/visualisation/feature_list_widget.py b/loopstructural/gui/visualisation/feature_list_widget.py
@@ -346,7 +346,6 @@ def _log(msg, level=0):
                     _log(f"Removed existing mesh: {mesh_name}")
                 except Exception:
                     _log(f"Failed to remove existing mesh: {mesh_name}")
-                    pass
 
                 try:
                     # Surfaces associated with individual features
diff --git a/loopstructural/gui/visualisation/object_list_widget.py b/loopstructural/gui/visualisation/object_list_widget.py
@@ -84,7 +84,7 @@ def add_mesh_item(self, mesh_name, mesh):
             if hasattr(self.viewer, 'actors') and mesh_name in getattr(self.viewer, 'actors', {}):
                 initial_visibility = bool(self.viewer.actors[mesh_name].visibility)
             elif hasattr(mesh, 'visibility'):
-                initial_visibility = bool(getattr(mesh, 'visibility'))
+                initial_visibility = bool(mesh.visibility)
         except Exception:
             initial_visibility = True
 
@@ -164,7 +164,7 @@ def add_object_item(self, object_name, instance=None):
         # Determine initial visibility
         visibility = False
         if instance is not None and hasattr(instance, 'visibility'):
-            visibility = bool(getattr(instance, 'visibility'))
+            visibility = bool(instance.visibility)
 
         visibilityCheckbox = QCheckBox()
         visibilityCheckbox.setChecked(visibility)
@@ -339,10 +339,8 @@ def export_selected_object(self):
                 break
 
         try:
-            if selected_format == "obj":
+            if selected_format == "obj" or selected_format == "vtk":
                 (mesh.save(file_path) if hasattr(mesh, "save") else pv.save_meshio(file_path, mesh))
-            elif selected_format == "vtk":
-                mesh.save(file_path) if hasattr(mesh, "save") else pv.save_meshio(file_path, mesh)
             elif selected_format == "ply":
                 pv.save_meshio(file_path, mesh)
             elif selected_format == "vtp":
diff --git a/loopstructural/gui/visualisation/object_properties_widget.py b/loopstructural/gui/visualisation/object_properties_widget.py
@@ -390,7 +390,7 @@ def setCurrentObject(self, object_name: str):
             mapper = getattr(actor, 'mapper', None)
             vis = False
             if mapper is not None and hasattr(mapper, 'scalar_visibility'):
-                vis = bool(getattr(mapper, 'scalar_visibility'))
+                vis = bool(mapper.scalar_visibility)
             self.scalar_bar_checkbox.setChecked(vis)
         except Exception:
             pass
@@ -405,7 +405,7 @@ def setCurrentObject(self, object_name: str):
                 try:
                     prop = getattr(actor, 'prop', None)
                     if prop is not None and hasattr(prop, 'edge_visibility'):
-                        show_edges = bool(getattr(prop, 'edge_visibility'))
+                        show_edges = bool(prop.edge_visibility)
                     elif hasattr(actor, 'GetProperty'):
                         p = actor.GetProperty()
                         if hasattr(p, 'GetEdgeVisibility'):
@@ -416,7 +416,7 @@ def setCurrentObject(self, object_name: str):
                 try:
                     prop = getattr(actor, 'prop', None)
                     if prop is not None and hasattr(prop, 'line_width'):
-                        line_width = float(getattr(prop, 'line_width'))
+                        line_width = float(prop.line_width)
                     elif hasattr(actor, 'GetProperty'):
                         p = actor.GetProperty()
                         if hasattr(p, 'GetLineWidth'):
diff --git a/loopstructural/main/data_manager.py b/loopstructural/main/data_manager.py
@@ -2,6 +2,8 @@
 from collections import defaultdict
 
 import numpy as np
+from LoopStructural.datatypes import BoundingBox
+from LoopStructural.modelling.core.stratigraphic_column import StratigraphicColumnElementType
 from qgis.core import (
     QgsCategorizedSymbolRenderer,
     QgsCoordinateReferenceSystem,
@@ -17,8 +19,6 @@
 from qgis.PyQt.QtGui import QColor
 
 from LoopStructural import FaultTopology, StratigraphicColumn
-from LoopStructural.datatypes import BoundingBox
-from LoopStructural.modelling.core.stratigraphic_column import StratigraphicColumnElementType
 
 from .m2l_api import paint_stratigraphic_order
 from .vectorLayerWrapper import qgsLayerToGeoDataFrame
diff --git a/loopstructural/main/m2l_api.py b/loopstructural/main/m2l_api.py
@@ -675,4 +675,3 @@ def paint_stratigraphic_order(
     geology_layer.commitChanges()
     if updater:
         updater("Stratigraphic order painted successfully.")
-    return
diff --git a/loopstructural/main/vectorLayerWrapper.py b/loopstructural/main/vectorLayerWrapper.py
@@ -673,7 +673,6 @@ def _crs_from_geodataframe_crs(crs_info) -> QgsCoordinateReferenceSystem:
             return QgsCoordinateReferenceSystem.fromEpsgId(int(epsg))
     except Exception:
         logger.debug("Failed to convert EPSG code to QgsCoordinateReferenceSystem", exc_info=True)
-        pass
     if isinstance(crs_info, str):
         try:
             temp = QgsCoordinateReferenceSystem(crs_info)
@@ -1141,7 +1140,6 @@ def _infer_wkb(series):
                     crs = QgsCoordinateReferenceSystem.fromEpsgId(int(epsg))
             except Exception as e:
                 print("Error building CRS from EPSG", e)
-                pass
 
     # --- Build QGIS fields from pandas dtypes
     fields = QgsFields()
diff --git a/loopstructural/plugin_main.py b/loopstructural/plugin_main.py
@@ -106,8 +106,8 @@ def injectLogHandler(self):
     def initGui(self):
         """Set up plugin UI elements."""
         self.injectLogHandler()
-        self.toolbar = self.iface.addToolBar(u'LoopStructural')
-        self.toolbar.setObjectName(u'LoopStructural')
+        self.toolbar = self.iface.addToolBar('LoopStructural')
+        self.toolbar.setObjectName('LoopStructural')
         # settings page within the QGIS preferences menu
         self.options_factory = PlgOptionsFactory()
         self.iface.registerOptionsWidgetFactory(self.options_factory)
@@ -133,7 +133,7 @@ def initGui(self):
             self.iface.mainWindow(),
         )
         self.action_settings.triggered.connect(
-            lambda: self.iface.showOptionsDialog(currentPage="mOptionsPage{}".format(__title__))
+            lambda: self.iface.showOptionsDialog(currentPage=f"mOptionsPage{__title__}")
         )
         self.action_modelling = QAction(
             QIcon(os.path.dirname(__file__) + "/icon.png"),
diff --git a/loopstructural/processing/provider.py b/loopstructural/processing/provider.py
@@ -32,7 +32,6 @@ class LoopstructuralProvider(QgsProcessingProvider):
 
     def loadAlgorithms(self):
         """Load all algorithms belonging to this provider."""
-        pass
 
     def id(self) -> str:
         """Return unique provider id.
@@ -95,7 +94,7 @@ def longName(self) -> str:
         :return: provider long name
         :rtype: str
         """
-        return self.tr("{} - Tools".format(__title__))
+        return self.tr(f"{__title__} - Tools")
 
     def icon(self) -> QIcon:
         """QIcon used for your provider inside the Processing toolbox menu.
diff --git a/loopstructural/toolbelt/log_handler.py b/loopstructural/toolbelt/log_handler.py
diff --git a/loopstructural/toolbelt/preferences.py b/loopstructural/toolbelt/preferences.py
diff --git a/pyproject.toml b/pyproject.toml
