From 428ecb09e7d36d5b702e66ac78f5a3c9ed9262be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Sun, 26 Jan 2025 19:49:58 +0100 Subject: [PATCH] chore: linting with black and ruff (#771) --- .pylintrc | 2 +- src/NanoVNASaver/Controls/SerialControl.py | 1 - src/NanoVNASaver/Hardware/Hardware.py | 2 +- src/NanoVNASaver/Hardware/NanoVNA.py | 1 + src/NanoVNASaver/Hardware/NanoVNA_V2.py | 1 + src/NanoVNASaver/Hardware/TinySA.py | 1 + src/NanoVNASaver/Hardware/VNA.py | 1 + src/NanoVNASaver/Windows/About.py | 1 - src/NanoVNASaver/Windows/Screenshot.py | 2 +- src/NanoVNASaver/Windows/SweepSettings.py | 7 +++---- src/NanoVNASaver/Windows/TDR.py | 1 + src/NanoVNASaver/Windows/ui/__init__.py | 7 ++++++- src/NanoVNASaver/__main__.py | 2 +- src/NanoVNASaver/utils/app_versions.py | 9 ++++++--- src/tools/project_clean.py | 12 ++++++------ uv.lock | 2 +- 16 files changed, 31 insertions(+), 21 deletions(-) diff --git a/.pylintrc b/.pylintrc index 3988b97c..123874f3 100644 --- a/.pylintrc +++ b/.pylintrc @@ -12,4 +12,4 @@ disable=W0614,C0410,C0321,C0111,I0011,C0103 # allow ls for list good-names=_,a,b,c,dt,db,e,f,fn,fd,i,j,k,v,kv,kw,l,m,n,ls,t,t0,t1,t2,t3,w,h,x,y,z,it,op [MASTER] -extension-pkg-allow-list=PyQt6.QtWidgets,PyQt6.QtGui,PyQt6.QtCore +extension-pkg-allow-list=PySide6.QtWidgets,PySide6.QtGui,PySide6.QtCore diff --git a/src/NanoVNASaver/Controls/SerialControl.py b/src/NanoVNASaver/Controls/SerialControl.py index 04cd0d3a..66a8ac3c 100644 --- a/src/NanoVNASaver/Controls/SerialControl.py +++ b/src/NanoVNASaver/Controls/SerialControl.py @@ -22,7 +22,6 @@ from PySide6 import QtWidgets from PySide6.QtCore import Signal - from NanoVNASaver.Controls.Control import Control from NanoVNASaver.Hardware.Hardware import Interface, get_interfaces, get_VNA diff --git a/src/NanoVNASaver/Hardware/Hardware.py b/src/NanoVNASaver/Hardware/Hardware.py index 4a2c5cc5..ab76a187 100644 --- a/src/NanoVNASaver/Hardware/Hardware.py +++ b/src/NanoVNASaver/Hardware/Hardware.py @@ -27,6 +27,7 @@ from NanoVNASaver.Hardware.AVNA import AVNA from NanoVNASaver.Hardware.JNCRadio_VNA_3G import JNCRadio_VNA_3G +from NanoVNASaver.Hardware.LiteVNA64 import LiteVNA64 from NanoVNASaver.Hardware.NanoVNA import NanoVNA from NanoVNASaver.Hardware.NanoVNA_F import NanoVNA_F from NanoVNASaver.Hardware.NanoVNA_F_V2 import NanoVNA_F_V2 @@ -38,7 +39,6 @@ from NanoVNASaver.Hardware.SV4401A import SV4401A from NanoVNASaver.Hardware.SV6301A import SV6301A from NanoVNASaver.Hardware.TinySA import TinySA, TinySA_Ultra -from NanoVNASaver.Hardware.LiteVNA64 import LiteVNA64 from NanoVNASaver.Hardware.VNA import VNA logger = logging.getLogger(__name__) diff --git a/src/NanoVNASaver/Hardware/NanoVNA.py b/src/NanoVNASaver/Hardware/NanoVNA.py index 41c94395..8c76429a 100644 --- a/src/NanoVNASaver/Hardware/NanoVNA.py +++ b/src/NanoVNASaver/Hardware/NanoVNA.py @@ -25,6 +25,7 @@ from NanoVNASaver.Hardware.Serial import Interface, drain_serial from NanoVNASaver.Hardware.VNA import VNA + from ..utils import Version logger = logging.getLogger(__name__) diff --git a/src/NanoVNASaver/Hardware/NanoVNA_V2.py b/src/NanoVNASaver/Hardware/NanoVNA_V2.py index 4c3e75d3..0f710421 100644 --- a/src/NanoVNASaver/Hardware/NanoVNA_V2.py +++ b/src/NanoVNASaver/Hardware/NanoVNA_V2.py @@ -23,6 +23,7 @@ from NanoVNASaver.Hardware.Serial import Interface from NanoVNASaver.Hardware.VNA import VNA + from ..utils import Version if platform.system() != "Windows": diff --git a/src/NanoVNASaver/Hardware/TinySA.py b/src/NanoVNASaver/Hardware/TinySA.py index 6b838dd1..80fdbd60 100644 --- a/src/NanoVNASaver/Hardware/TinySA.py +++ b/src/NanoVNASaver/Hardware/TinySA.py @@ -25,6 +25,7 @@ from NanoVNASaver.Hardware.Serial import Interface, drain_serial from NanoVNASaver.Hardware.VNA import VNA + from ..utils import Version logger = logging.getLogger(__name__) diff --git a/src/NanoVNASaver/Hardware/VNA.py b/src/NanoVNASaver/Hardware/VNA.py index ca43f941..2f3d0ac7 100644 --- a/src/NanoVNASaver/Hardware/VNA.py +++ b/src/NanoVNASaver/Hardware/VNA.py @@ -23,6 +23,7 @@ from PySide6 import QtGui from NanoVNASaver.Hardware.Serial import Interface, drain_serial + from ..utils import Version logger = logging.getLogger(__name__) diff --git a/src/NanoVNASaver/Windows/About.py b/src/NanoVNASaver/Windows/About.py index e70a190a..c51d1c53 100644 --- a/src/NanoVNASaver/Windows/About.py +++ b/src/NanoVNASaver/Windows/About.py @@ -48,7 +48,6 @@ def __init__(self, app: QtWidgets.QWidget): self.ui.btn_updates.clicked.connect(self.find_updates) - def show(self): super().show() self.update_labels() diff --git a/src/NanoVNASaver/Windows/Screenshot.py b/src/NanoVNASaver/Windows/Screenshot.py index 9f6ab61c..3afd6cc8 100644 --- a/src/NanoVNASaver/Windows/Screenshot.py +++ b/src/NanoVNASaver/Windows/Screenshot.py @@ -20,7 +20,7 @@ from PySide6 import QtCore, QtGui, QtWidgets -#from .ui import get_window_icon +# from .ui import get_window_icon logger = logging.getLogger(__name__) diff --git a/src/NanoVNASaver/Windows/SweepSettings.py b/src/NanoVNASaver/Windows/SweepSettings.py index c742407d..faca34eb 100644 --- a/src/NanoVNASaver/Windows/SweepSettings.py +++ b/src/NanoVNASaver/Windows/SweepSettings.py @@ -28,6 +28,7 @@ ) from NanoVNASaver.Settings.Sweep import SweepMode from NanoVNASaver.Windows.Defaults import make_scrollable + from .ui import get_window_icon logger = logging.getLogger(__name__) @@ -230,12 +231,10 @@ def update_band(self, apply: bool = False): self.band_list.currentIndex(), 2 ) start = int( - self.band_list.model() - .data(index_start, Qt.ItemDataRole.EditRole) + self.band_list.model().data(index_start, Qt.ItemDataRole.EditRole) ) stop = int( - self.band_list.model() - .data(index_stop, Qt.ItemDataRole.EditRole) + self.band_list.model().data(index_stop, Qt.ItemDataRole.EditRole) ) if self.padding > 0: diff --git a/src/NanoVNASaver/Windows/TDR.py b/src/NanoVNASaver/Windows/TDR.py index 4b6248ab..de75fc6b 100644 --- a/src/NanoVNASaver/Windows/TDR.py +++ b/src/NanoVNASaver/Windows/TDR.py @@ -26,6 +26,7 @@ from scipy.signal import convolve # type: ignore from NanoVNASaver.Windows.Defaults import make_scrollable + from .ui import get_window_icon logger = logging.getLogger(__name__) diff --git a/src/NanoVNASaver/Windows/ui/__init__.py b/src/NanoVNASaver/Windows/ui/__init__.py index c2b47859..406277c2 100644 --- a/src/NanoVNASaver/Windows/ui/__init__.py +++ b/src/NanoVNASaver/Windows/ui/__init__.py @@ -13,4 +13,9 @@ def get_window_icon() -> QIcon: return icon -__all__ = ["qInitResources", "Ui_DialogAbout", "WINDOW_ICON_RES", "get_window_icon"] +__all__ = [ + "qInitResources", + "Ui_DialogAbout", + "WINDOW_ICON_RES", + "get_window_icon", +] diff --git a/src/NanoVNASaver/__main__.py b/src/NanoVNASaver/__main__.py index eee9fb50..d1b7d9d4 100644 --- a/src/NanoVNASaver/__main__.py +++ b/src/NanoVNASaver/__main__.py @@ -31,9 +31,9 @@ from PySide6 import QtWidgets from NanoVNASaver.About import INFO, VERSION -from NanoVNASaver.utils import get_runtime_information from NanoVNASaver.NanoVNASaver import NanoVNASaver from NanoVNASaver.Touchstone import Touchstone +from NanoVNASaver.utils import get_runtime_information def main(): diff --git a/src/NanoVNASaver/utils/app_versions.py b/src/NanoVNASaver/utils/app_versions.py index 9fe11bd2..364a5ae5 100644 --- a/src/NanoVNASaver/utils/app_versions.py +++ b/src/NanoVNASaver/utils/app_versions.py @@ -1,10 +1,10 @@ - import platform from functools import cache from importlib.metadata import PackageNotFoundError, distributions, version UNKNOWN_VERSION = "unknown" + @cache def get_app_version() -> str: try: @@ -13,13 +13,16 @@ def get_app_version() -> str: except PackageNotFoundError: # pragma: no cover return UNKNOWN_VERSION + @cache def get_lib_versions() -> list[str]: - return [f"{dist.name}: {dist.version}" for dist in distributions()] + return [f"{dist.name}: {dist.version}" for dist in distributions()] + @cache def get_host_platform() -> list[str]: - return [ f"Platform: {platform.platform()}", f"CPU: {platform.processor()}"] + return [f"Platform: {platform.platform()}", f"CPU: {platform.processor()}"] + def get_runtime_information() -> list[str]: return get_host_platform() + get_lib_versions() diff --git a/src/tools/project_clean.py b/src/tools/project_clean.py index c7f7b796..b73d43a6 100644 --- a/src/tools/project_clean.py +++ b/src/tools/project_clean.py @@ -11,22 +11,22 @@ def main() -> None: rm_dir("build") print("Removing '*.egg-info' dir...") - for dir in glob.glob('./src/**/*.egg-info', recursive=True): + for dir in glob.glob("./src/**/*.egg-info", recursive=True): rm_dir(dir) print("Removing '__pycache__' dirs...") - for dir in glob.glob('./src/**/__pycache__', recursive=True): + for dir in glob.glob("./src/**/__pycache__", recursive=True): rm_dir(dir) - for dir in glob.glob('./tests/**/__pycache__', recursive=True): + for dir in glob.glob("./tests/**/__pycache__", recursive=True): rm_dir(dir) print("Removing log files...") - for file in glob.glob('./**/*.log', recursive=True): + for file in glob.glob("./**/*.log", recursive=True): rm_dir(file) -def rm_dir(dir_or_file: str|Path) -> None: - if isinstance(dir_or_file,str): +def rm_dir(dir_or_file: str | Path) -> None: + if isinstance(dir_or_file, str): dir_or_file = Path(dir_or_file) if dir_or_file.is_file(): dir_or_file.unlink() diff --git a/uv.lock b/uv.lock index 7fc569b4..68dd08e0 100644 --- a/uv.lock +++ b/uv.lock @@ -273,7 +273,7 @@ wheels = [ [[package]] name = "nanovnasaver" -version = "0.6.8.post1.dev16+g2e3883e.d20250121" +version = "0.6.8.post1.dev13+g9ca8d0f.d20250126" source = { editable = "." } dependencies = [ { name = "numpy" },