From 109bd5838417241f4104128e62ee974ec54b0594 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Mon, 10 Aug 2026 16:13:33 +0500 Subject: [PATCH] ruff: use readable rule names in ignores --- pyproject.toml | 2 ++ src/bonsai/bonsai/bim/module/cost/operator.py | 2 +- src/bonsai/bonsai/bim/module/drawing/gizmos.py | 2 +- src/bonsai/bonsai/bim/module/model/data.py | 2 +- src/bonsai/bonsai/tool/__init__.py | 2 +- src/bonsai/scripts/setup_pytest.py | 8 ++++---- src/ifcopenshell-python/ifcopenshell/geom/__init__.py | 4 ++-- src/ifcopenshell-python/ifcopenshell/geom/app.py | 2 +- .../ifcpatch/recipes/ExtractPropertiesToSQLite.py | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 36581dbb3b..484663edab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,6 +68,8 @@ select = [ "I", # import sorting "unused-noqa", "rule-codes-in-selectors", + "noqa-comments", + "rule-codes-in-suppression-comments", ] ignore = [ # Conflicts with Blender using annotations for props definitions. diff --git a/src/bonsai/bonsai/bim/module/cost/operator.py b/src/bonsai/bonsai/bim/module/cost/operator.py index ac9d2d4bf1..893e956fc0 100644 --- a/src/bonsai/bonsai/bim/module/cost/operator.py +++ b/src/bonsai/bonsai/bim/module/cost/operator.py @@ -987,7 +987,7 @@ class ExportCostSchedulesToPDF(bpy.types.Operator, ExportHelper): @classmethod def poll(cls, context): try: - import typst # noqa: F401 + import typst # ruff: ignore[unused-import] return True except ModuleNotFoundError: diff --git a/src/bonsai/bonsai/bim/module/drawing/gizmos.py b/src/bonsai/bonsai/bim/module/drawing/gizmos.py index 17a86d3d04..7f7763bce3 100644 --- a/src/bonsai/bonsai/bim/module/drawing/gizmos.py +++ b/src/bonsai/bonsai/bim/module/drawing/gizmos.py @@ -28,7 +28,7 @@ operators via ``target_set_operator``; drag handles inherit modal state from ``GizmoMovable``. """ -__all__ = [ # noqa: RUF022 (unsorted `__all__`) +__all__ = [ # ruff: ignore[unsorted-dunder-all] "GizmoColor", "GizmoAxis", "TextAlignment", diff --git a/src/bonsai/bonsai/bim/module/model/data.py b/src/bonsai/bonsai/bim/module/model/data.py index 36cde4eb0d..dafbeece55 100644 --- a/src/bonsai/bonsai/bim/module/model/data.py +++ b/src/bonsai/bonsai/bim/module/model/data.py @@ -430,7 +430,7 @@ class SverchokData: @classmethod def has_sverchok(cls) -> bool: try: - import sverchok # noqa: F401 + import sverchok # ruff: ignore[unused-import] return True except ModuleNotFoundError: diff --git a/src/bonsai/bonsai/tool/__init__.py b/src/bonsai/bonsai/tool/__init__.py index 58d65567c2..ff08f82309 100644 --- a/src/bonsai/bonsai/tool/__init__.py +++ b/src/bonsai/bonsai/tool/__init__.py @@ -17,7 +17,7 @@ # along with Bonsai. If not, see . # # Ignore unused imports. -# ruff: noqa: F401 +# ruff: file-ignore[unused-import] from bonsai.tool.aggregate import Aggregate from bonsai.tool.array import Array diff --git a/src/bonsai/scripts/setup_pytest.py b/src/bonsai/scripts/setup_pytest.py index a4e56ca35c..3011cb5b1c 100644 --- a/src/bonsai/scripts/setup_pytest.py +++ b/src/bonsai/scripts/setup_pytest.py @@ -45,10 +45,10 @@ for dep in dependencies: subprocess.check_call(command + [dep]) try: - import pygments # noqa: F401 - import pytest # noqa: F401 - import pytest_bdd # noqa: F401 - import pytest_blender # noqa: F401 + import pygments # ruff: ignore[unused-import] + import pytest # ruff: ignore[unused-import] + import pytest_bdd # ruff: ignore[unused-import] + import pytest_blender # ruff: ignore[unused-import] print("Test dependency installation was successful!") except Exception as e: diff --git a/src/ifcopenshell-python/ifcopenshell/geom/__init__.py b/src/ifcopenshell-python/ifcopenshell/geom/__init__.py index 2b01d63925..d4ecba81e2 100644 --- a/src/ifcopenshell-python/ifcopenshell/geom/__init__.py +++ b/src/ifcopenshell-python/ifcopenshell/geom/__init__.py @@ -40,7 +40,7 @@ def _has_occ(): pass try: - import OCC.BRepTools # noqa: F401 # pyright: ignore[reportMissingImports] # ty:ignore[unresolved-import] + import OCC.BRepTools # ruff: ignore[unused-import] # pyright: ignore[reportMissingImports] # ty:ignore[unresolved-import] return True except ImportError: @@ -52,6 +52,6 @@ def _has_occ(): has_occ = _has_occ() if has_occ: - from . import occ_utils as utils # noqa: F401 + from . import occ_utils as utils # ruff: ignore[unused-import] from .main import * diff --git a/src/ifcopenshell-python/ifcopenshell/geom/app.py b/src/ifcopenshell-python/ifcopenshell/geom/app.py index f4cc245c78..576a1904e2 100644 --- a/src/ifcopenshell-python/ifcopenshell/geom/app.py +++ b/src/ifcopenshell-python/ifcopenshell/geom/app.py @@ -25,7 +25,7 @@ import time import ifcopenshell.ifcopenshell_wrapper as W try: - from OCC.Core import AIS # noqa: F401 + from OCC.Core import AIS # ruff: ignore[unused-import] USE_OCCT_HANDLE = False except ImportError: diff --git a/src/ifcpatch/ifcpatch/recipes/ExtractPropertiesToSQLite.py b/src/ifcpatch/ifcpatch/recipes/ExtractPropertiesToSQLite.py index c91467036f..e55360a1a1 100644 --- a/src/ifcpatch/ifcpatch/recipes/ExtractPropertiesToSQLite.py +++ b/src/ifcpatch/ifcpatch/recipes/ExtractPropertiesToSQLite.py @@ -26,7 +26,7 @@ import ifcopenshell.util.element import ifcpatch try: - import sqlite3 # noqa: F401 + import sqlite3 # ruff: ignore[unused-import] except: print("No SQLite support")