fix linter warnings

This commit is contained in:
Kevin Hester
2024-06-25 11:02:24 -07:00
parent 07fc991f4e
commit 1b045bec88
5 changed files with 16 additions and 16 deletions

View File

@@ -1,6 +1,6 @@
"""Support for logging from power meters/supplies."""
from .power_supply import PowerMeter, PowerSupply, PowerError
from .riden import RidenPowerSupply
from .power_supply import PowerError, PowerMeter, PowerSupply
from .ppk2 import PPK2PowerSupply
from .sim import SimPowerSupply
from .riden import RidenPowerSupply
from .sim import SimPowerSupply

View File

@@ -1,7 +1,7 @@
"""code logging power consumption of meshtastic devices."""
import logging
from typing import *
from typing import Optional
from ppk2_api import ppk2_api
@@ -56,5 +56,3 @@ class PPK2PowerSupply(PowerSupply):
def powerOff(self):
"""Power off the supply."""
self.r.toggle_DUT_power("OFF")

View File

@@ -2,9 +2,8 @@
import math
import time
from typing import *
from .power_supply import PowerError, PowerSupply
from .power_supply import PowerSupply
class SimPowerSupply(PowerSupply):

View File

@@ -1,3 +1,5 @@
"""Utilities for Apache Arrow serialization."""
import pyarrow as pa
chunk_size = 1000 # disk writes are batched based on this number of rows

View File

@@ -2,10 +2,10 @@
import atexit
import logging
import os
import re
import threading
import time
import os
from dataclasses import dataclass
from datetime import datetime
from typing import Optional
@@ -18,7 +18,6 @@ from meshtastic.mesh_interface import MeshInterface
from meshtastic.powermon import PowerMeter
from .arrow import ArrowWriter
import os
@dataclass(init=False)
@@ -58,7 +57,9 @@ class PowerLogger:
self.writer = ArrowWriter(file_path)
self.interval = interval
self.is_logging = True
self.thread = threading.Thread(target=self._logging_thread, name="PowerLogger", daemon=True)
self.thread = threading.Thread(
target=self._logging_thread, name="PowerLogger", daemon=True
)
self.thread.start()
def _logging_thread(self) -> None:
@@ -92,10 +93,9 @@ class StructuredLogger:
"""
self.client = client
self.writer = ArrowWriter(f"{dir_path}/slog.arrow")
# trunk-ignore(pylint/R1732)
self.raw_file = open(
f"{dir_path}/raw.txt", "w", encoding="utf8"
)
) # pylint: disable=consider-using-with
self.listener = pub.subscribe(self._onLogMessage, TOPIC_MESHTASTIC_LOG_LINE)
def close(self) -> None:
@@ -163,15 +163,16 @@ class LogSet:
self.power_logger = None
# Store a lambda so we can find it again to unregister
self.atexit_handler = lambda: self.close()
atexit.register(self.close)
self.atexit_handler = lambda: self.close() # pylint: disable=unnecessary-lambda
def close(self) -> None:
"""Close the log set."""
if self.slog_logger:
logging.info(f"Closing slogs in {self.dir_name}")
atexit.unregister(self.atexit_handler) # docs say it will silently ignore if not found
atexit.unregister(
self.atexit_handler
) # docs say it will silently ignore if not found
self.slog_logger.close()
if self.power_logger:
self.power_logger.close()