From 4cebe94b87d4075e5b54ed71885a6bf26b56dc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Wed, 1 Feb 2023 11:38:34 +0100 Subject: [PATCH] Linting --- NanoVNASaver/Charts/Chart.py | 2 +- setup.py | 11 +++++------ test/test_analytics.py | 2 +- test/test_formatting.py | 24 ++++++++++++++++++------ 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/NanoVNASaver/Charts/Chart.py b/NanoVNASaver/Charts/Chart.py index 5e03b59..1687120 100644 --- a/NanoVNASaver/Charts/Chart.py +++ b/NanoVNASaver/Charts/Chart.py @@ -36,7 +36,7 @@ logger = logging.getLogger(__name__) class ChartColors: # pylint: disable=too-many-instance-attributes background: QColor = field(default_factory=lambda: QColor(QtCore.Qt.white)) foreground: QColor = field( - default_factory=lambda: QColor(QtCore.Qt.lightGray)) + default_factory=lambda: QColor(QtCore.Qt.lightGray)) reference: QColor = field(default_factory=lambda: QColor(0, 0, 255, 64)) reference_secondary: QColor = field( default_factory=lambda: QColor(0, 0, 192, 48)) diff --git a/setup.py b/setup.py index 29233ff..b51f5b5 100644 --- a/setup.py +++ b/setup.py @@ -19,10 +19,9 @@ from setuptools import setup setup( - data_files=[ - ( "share/doc/nanovnasaver/", [ "LICENSE", "README.md" ] ), - ( "share/applications/", [ "NanoVNASaver.desktop" ] ), - ( "share/icons/hicolor/48x48/apps/", [ "NanoVNASaver_48x48.png" ] ), - ] + data_files=[ + ("share/doc/nanovnasaver/", ["LICENSE", "README.md", ]), + ("share/applications/", ["NanoVNASaver.desktop", ]), + ("share/icons/hicolor/48x48/apps/", ["NanoVNASaver_48x48.png", ]), + ] ) - diff --git a/test/test_analytics.py b/test/test_analytics.py index 401735f..6bcbe1f 100644 --- a/test/test_analytics.py +++ b/test/test_analytics.py @@ -23,7 +23,7 @@ import numpy as np # Import targets to be tested import NanoVNASaver.AnalyticTools as at -SINEWAVE = [math.sin(x/45 * math.pi) for x in range(360)] +SINEWAVE = [math.sin(x / 45 * math.pi) for x in range(360)] class AnalyticsTools(unittest.TestCase): diff --git a/test/test_formatting.py b/test/test_formatting.py index 8f263f6..91eb2d0 100644 --- a/test/test_formatting.py +++ b/test/test_formatting.py @@ -139,12 +139,24 @@ class TestCases(unittest.TestCase): self.assertEqual(fmt.format_phase(-3.1416), '-180.00°') def test_format_complex_imp(self): - self.assertEqual(fmt.format_complex_imp(complex(1, 0)), '1+j0 \N{OHM SIGN}') - self.assertEqual(fmt.format_complex_imp(complex(1234, 1234)), '1.23k+j1.23k \N{OHM SIGN}') - self.assertEqual(fmt.format_complex_imp(complex(1234, -1234)), '1.23k-j1.23k \N{OHM SIGN}') - self.assertEqual(fmt.format_complex_imp(complex(1.234, 1234)), '1.23+j1.23k \N{OHM SIGN}') - self.assertEqual(fmt.format_complex_imp(complex(-1, 1.23e-3)), '- +j1.23m \N{OHM SIGN}') - self.assertEqual(fmt.format_complex_imp(complex(-1, 1.23e-3), True), '-1+j1.23m \N{OHM SIGN}') + self.assertEqual( + fmt.format_complex_imp(complex(1, 0)), + '1+j0 \N{OHM SIGN}') + self.assertEqual( + fmt.format_complex_imp(complex(1234, 1234)), + '1.23k+j1.23k \N{OHM SIGN}') + self.assertEqual( + fmt.format_complex_imp(complex(1234, -1234)), + '1.23k-j1.23k \N{OHM SIGN}') + self.assertEqual( + fmt.format_complex_imp(complex(1.234, 1234)), + '1.23+j1.23k \N{OHM SIGN}') + self.assertEqual( + fmt.format_complex_imp(complex(-1, 1.23e-3)), + '- +j1.23m \N{OHM SIGN}') + self.assertEqual( + fmt.format_complex_imp(complex(-1, 1.23e-3), True), + '-1+j1.23m \N{OHM SIGN}') def test_format_wavelength(self): self.assertEqual(fmt.format_wavelength(12.3456), '12.35 m')