Merge pull request #251 from MaddyGuthridge/maddy-update-linting

Linting: switch from Flake8 to Ruff

Author: MaddyGuthridge

.github/workflows/python-app.yml

@@ -47,9 +47,9 @@ jobs:
         key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
     - run: poetry --version
     - run: poetry install
-    - name: Lint with flake8
+    - name: Lint with ruff
       run: |
-        poetry run flake8
+        poetry run ruff check
 
   Mypy:
     runs-on: ubuntu-latest
@@ -70,7 +70,7 @@ jobs:
     - run: poetry install
     - name: Lint with mypy
       run: |
-        poetry run mypy .
+        poetry run mypy
 
   Load:
     runs-on: ubuntu-latest

poetry.lock

@@ -26,8 +26,24 @@ exclude_also = [
     'raise NotImplementedError',
 ]
 
-[tool.flake8]
-exclude = ['.git', '__pycache__', 'dist', 'site']
+[tool.ruff]
+line-length = 79
+
+[tool.ruff.lint]
+select = [
+    # pycodestyle
+    "E",
+    # Pyflakes
+    "F",
+    # pyupgrade
+    "UP",
+    # flake8-bugbear
+    "B",
+    # flake8-simplify
+    "SIM",
+    # isort
+    "I",
+]
 
 [tool.poetry.dependencies]
 python = "^3.9.1"
@@ -37,13 +53,10 @@ jestspectation = "^1.4.5"
 
 [tool.poetry.group.dev.dependencies]
 coverage = "^7.8.0"
-flake8 = "^7.1.1"
-isort = "^6.0.1"
 mypy = "^1.15.0"
 pytest = "^8.3.5"
-autopep8 = "^2.3.2"
 jestspectation = "^1.4.5"
-flake8-pyproject = "^1.2.3"
+ruff = "^0.11.7"
 
 [build-system]
 requires = ["poetry-core"]

pyproject.toml

@@ -26,22 +26,20 @@
 ]
 
 
-from . import exceptions
-from .logger import log, verbosity
-from .profiler import ProfilerContext, profilerDecoration
+# Import devices and plugins
+import devices
+import integrations
 
+from . import exceptions
 from .context_manager import (
+    catchContextResetException,
     getContext,
     resetContext,
     unsafeResetContext,
-    catchContextResetException
 )
-
 from .extension_manager import ExtensionManager
-
-# Import devices and plugins
-import devices
-import integrations
+from .logger import log, verbosity
+from .profiler import ProfilerContext, profilerDecoration
 
 del devices
 del integrations

src/common/__init__.py

@@ -12,21 +12,23 @@
 """
 
 from typing import Optional
+
+import plugins
 import ui
-from common.profiler import profilerDecoration
+
 from common.plug_indexes import (
-    PluginIndex,
-    GeneratorIndex,
     EffectIndex,
-    WindowIndex,
     FlIndex,
+    GeneratorIndex,
+    PluginIndex,
+    WindowIndex,
 )
+from common.profiler import profilerDecoration
+from common.types.bool_s import BoolS
 from common.util.api_fixes import (
     getFocusedPluginIndex,
     getFocusedWindowIndex,
 )
-from common.types.bool_s import BoolS
-import plugins
 
 
 class ActivityState:
@@ -45,7 +47,7 @@ def __init__(self) -> None:
         self._effect: EffectIndex = EffectIndex(0, 0)
         self._plugin: PluginIndex = self._generator
         self._plugin_name = ""
-        self._plug_active = True if self._plugin is not None else False
+        self._plug_active = self._plugin is not None
         self._changed = False
         self._plug_unsafe = False
         self._history: list[FlIndex] = []