Fix linting issues introducd by #14

.github/workflows/code.yml

@@ -10,6 +10,8 @@ on:
     tags:
       - "*"
   pull_request:
+    branches:
+      - main
   schedule:
     # Run every Monday at 8am to check latest versions of dependencies
     - cron: "0 8 * * MON"
@@ -57,12 +59,11 @@ jobs:
       matrix:
         os: ["ubuntu-latest"] # can add windows-latest, macos-latest
         python: ["3.10", "3.11", "3.12"]
-        pipenv: ["skip-lock"]
-
+        pipenv: [""]
         include:
-          # Add an extra Python3.8 runner to use the lockfile
+          # Add an extra Python3.10 runner to use the lockfile
           - os: "ubuntu-latest"
-            python: "3.8"
+            python: "3.10"
             pipenv: "deploy"
 
     runs-on: ${{ matrix.os }}

setup.cfg

@@ -39,7 +39,7 @@ install_requires =
 [options.extras_require]
 # For development tests/docs
 dev =
-    black>=22.3.0
+    black>=23.1.0
     isort>5.0
     pytest-cov
     mypy
@@ -75,9 +75,12 @@ float_to_top=true
 # Make flake8 respect black's line length (default 88),
 max-line-length = 88
 extend-ignore =
-    E203,  # See https://github.com/PyCQA/pycodestyle/issues/373
-    F811,  # support typing.overload decorator
-    F722, # allow Annotated[typ, some_func("some string")]
+# See https://github.com/PyCQA/pycodestyle/issues/373
+    E203, 
+# support typing.overload decorator
+    F811,
+# allow Annotated[typ, some_func("some string")]
+    F722 
 
 [tool:pytest]
 # Run pytest with all our checkers, and don't spam us with massive tracebacks on error

src/maaspower/__main__.py

@@ -12,8 +12,8 @@
 # import all subclasses of SwitchDevice so ApiSchema sees them
 from .devices.shell_cmd import CommandLine
 from .devices.smart_thing import SmartThing
-from .devices.web_ui import WebGui
 from .devices.web_device import WebDevice
+from .devices.web_ui import WebGui
 from .maasconfig import MaasConfig
 from .webhook import run_web_hook
 

src/maaspower/devices/shell_cmd.py

@@ -10,11 +10,11 @@
 import subprocess
 from dataclasses import dataclass
 
-from typing import Optional
-from typing_extensions import Literal, Annotated as A
+from typing_extensions import Annotated as A
+from typing_extensions import Literal
 
-from maaspower.maasconfig import RegexSwitchDevice
 from maaspower.maas_globals import desc
+from maaspower.maasconfig import RegexSwitchDevice
 
 
 @dataclass(kw_only=True)

src/maaspower/devices/smart_thing.py

@@ -9,14 +9,14 @@
 """
 import asyncio
 from dataclasses import dataclass
-from typing import Optional
 
 import aiohttp
 from pysmartthings import SmartThings
-from typing_extensions import Literal, Annotated as A
+from typing_extensions import Annotated as A
+from typing_extensions import Literal
 
-from maaspower.maasconfig import RegexSwitchDevice
 from maaspower.maas_globals import desc
+from maaspower.maasconfig import RegexSwitchDevice
 
 
 @dataclass(kw_only=True)

src/maaspower/devices/web_device.py

@@ -4,10 +4,11 @@
 from dataclasses import dataclass
 from typing import Optional, cast
 
-from typing_extensions import Literal, Annotated as A
+from typing_extensions import Annotated as A
+from typing_extensions import Literal
 
-from maaspower.maasconfig import MaasConfig, SwitchDevice
 from maaspower.maas_globals import desc
+from maaspower.maasconfig import MaasConfig, SwitchDevice
 
 from ..webhook import app
 from .web_ui import WebGui

src/maaspower/devices/web_ui.py

@@ -14,9 +14,8 @@
 from typing_extensions import Annotated as A
 from typing_extensions import Literal
 
-from maaspower.maasconfig import RegexSwitchDevice
 from maaspower.maas_globals import desc
-
+from maaspower.maasconfig import RegexSwitchDevice
 
 command_regex = re.compile(r"([^\/]*)\/([^\/]*)\/?([^\/]*)?\/?([^\/]*)?$")
 index_regex = re.compile(r"(.*)\[([0-9]*)\]")

src/maaspower/maasconfig.py

@@ -20,7 +20,8 @@
 
 from apischema import deserialize, identity
 from apischema.conversions import Conversion, deserializer
-from typing_extensions import Annotated as A, override
+from typing_extensions import Annotated as A
+from typing_extensions import override
 
 from .maas_globals import MaasResponse, T, desc
 
@@ -108,6 +109,7 @@ class RegexSwitchDevice(SwitchDevice, ABC):
     and convert them to the requisit MaasReponse values using regex.
 
     """
+
     query_on_regex: A[str, desc("match the on status return from query")] = "on"
     query_off_regex: A[str, desc("match the off status return from query")] = "off"