From e6242a975fa75301c73024bd34f53e92ab6790c1 Mon Sep 17 00:00:00 2001 From: Teque5 Date: Sat, 30 May 2026 21:57:58 -0700 Subject: [PATCH 1/3] address pylint & flake8 issues --- sigmf/archive.py | 1 - sigmf/archivereader.py | 3 +-- sigmf/convert/wav.py | 1 - sigmf/schema.py | 4 ++-- sigmf/siggen.py | 2 +- sigmf/sigmffile.py | 3 +-- sigmf/utils.py | 3 +-- sigmf/validate.py | 2 +- tests/test_archive.py | 2 +- tests/test_archivereader.py | 1 - tests/test_attributes.py | 2 -- tests/test_convert_signalhound.py | 1 - tests/test_ncd.py | 1 - tests/test_sigmffile.py | 2 -- tests/testdata.py | 4 +--- 15 files changed, 9 insertions(+), 23 deletions(-) diff --git a/sigmf/archive.py b/sigmf/archive.py index f506336..51ce045 100644 --- a/sigmf/archive.py +++ b/sigmf/archive.py @@ -17,7 +17,6 @@ from .keys import ( SIGMF_ARCHIVE_EXT, SIGMF_ARCHIVE_EXTS, - SIGMF_COLLECTION_EXT, SIGMF_COMPRESSED_EXTS, SIGMF_DATASET_EXT, SIGMF_METADATA_EXT, diff --git a/sigmf/archivereader.py b/sigmf/archivereader.py index 1133716..a2dc6ee 100644 --- a/sigmf/archivereader.py +++ b/sigmf/archivereader.py @@ -11,12 +11,11 @@ import zipfile from pathlib import Path -from . import __version__, keys +from . import keys from .archive import _detect_compression from .error import SigMFFileError from .hashing import calculate_sha512 from .keys import ( - SIGMF_ARCHIVE_EXT, SIGMF_ARCHIVE_EXTS, SIGMF_DATASET_EXT, SIGMF_METADATA_EXT, diff --git a/sigmf/convert/wav.py b/sigmf/convert/wav.py index 8e1dec9..ecd1f70 100644 --- a/sigmf/convert/wav.py +++ b/sigmf/convert/wav.py @@ -17,7 +17,6 @@ import numpy as np from .. import SigMFFile -from .. import __version__ as toolversion from .. import fromfile, keys from ..error import SigMFFileExistsError from ..sigmffile import get_sigmf_filenames diff --git a/sigmf/schema.py b/sigmf/schema.py index 300f610..86fa53b 100644 --- a/sigmf/schema.py +++ b/sigmf/schema.py @@ -9,13 +9,13 @@ import json from pathlib import Path -from . import __version__ as toolversion +from . import __specification__ as specification SCHEMA_META = "schema-meta.json" SCHEMA_COLLECTION = "schema-collection.json" -def get_schema(version=toolversion, schema_file=SCHEMA_META): +def get_schema(version=specification, schema_file=SCHEMA_META): """ Load JSON Schema to for either a `sigmf-meta` or `sigmf-collection`. diff --git a/sigmf/siggen.py b/sigmf/siggen.py index 453d3c8..1122d5e 100644 --- a/sigmf/siggen.py +++ b/sigmf/siggen.py @@ -590,7 +590,7 @@ def _build_metadata(self, samples: np.ndarray) -> dict: self._description = desc # build generator info - generator_info = f"SigMFGenerator" + generator_info = "SigMFGenerator" if self._seed is not None: generator_info += f"(seed={self._seed:#x})" diff --git a/sigmf/sigmffile.py b/sigmf/sigmffile.py index 6df555e..c4b6887 100644 --- a/sigmf/sigmffile.py +++ b/sigmf/sigmffile.py @@ -15,11 +15,10 @@ import numpy as np -from . import __specification__, __version__, hashing, keys, schema, validate +from . import __specification__, hashing, keys, schema, validate from .archive import ( SigMFArchive, _detect_compression, - _get_archive_basename, ) from .error import ( SigMFAccessError, diff --git a/sigmf/utils.py b/sigmf/utils.py index 7d8f54f..571a5e4 100644 --- a/sigmf/utils.py +++ b/sigmf/utils.py @@ -10,11 +10,10 @@ import sys from copy import deepcopy from datetime import datetime, timezone -from pathlib import Path import numpy as np -from .error import SigMFConversionError, SigMFError +from .error import SigMFError SIGMF_DATETIME_ISO8601_FMT = "%Y-%m-%dT%H:%M:%S.%fZ" diff --git a/sigmf/validate.py b/sigmf/validate.py index cc35865..8e22b92 100644 --- a/sigmf/validate.py +++ b/sigmf/validate.py @@ -24,7 +24,7 @@ import jsonschema from . import __version__ as toolversion -from . import error, keys, schema, sigmffile +from . import error, schema, sigmffile def _get_namespaces_declared(metadata: dict) -> set: diff --git a/tests/test_archive.py b/tests/test_archive.py index 026edc8..23d2aa5 100644 --- a/tests/test_archive.py +++ b/tests/test_archive.py @@ -18,7 +18,7 @@ import jsonschema import numpy as np -from sigmf import DATATYPE_KEY, SigMFFile, __specification__, error, fromfile +from sigmf import DATATYPE_KEY, SigMFFile, error, fromfile from sigmf.archivereader import SigMFArchiveReader from .testdata import TEST_FLOAT32_DATA, TEST_METADATA diff --git a/tests/test_archivereader.py b/tests/test_archivereader.py index e545793..a5e46d5 100644 --- a/tests/test_archivereader.py +++ b/tests/test_archivereader.py @@ -16,7 +16,6 @@ NUM_CHANNELS_KEY, SigMFArchiveReader, SigMFFile, - __specification__, fromfile, ) diff --git a/tests/test_attributes.py b/tests/test_attributes.py index 67f84a6..a6c7b49 100644 --- a/tests/test_attributes.py +++ b/tests/test_attributes.py @@ -3,8 +3,6 @@ import copy import unittest -import numpy as np - import sigmf from sigmf import SigMFFile from sigmf.error import SigMFAccessError diff --git a/tests/test_convert_signalhound.py b/tests/test_convert_signalhound.py index f4e3f1e..503ed7c 100644 --- a/tests/test_convert_signalhound.py +++ b/tests/test_convert_signalhound.py @@ -8,7 +8,6 @@ import tempfile import unittest -import wave from pathlib import Path import numpy as np diff --git a/tests/test_ncd.py b/tests/test_ncd.py index 6f5fc5b..c4629d5 100644 --- a/tests/test_ncd.py +++ b/tests/test_ncd.py @@ -10,7 +10,6 @@ import shutil import tempfile import unittest -import warnings from pathlib import Path import numpy as np diff --git a/tests/test_sigmffile.py b/tests/test_sigmffile.py index c090404..6b9f137 100644 --- a/tests/test_sigmffile.py +++ b/tests/test_sigmffile.py @@ -11,14 +11,12 @@ import shutil import tempfile import unittest -import warnings from pathlib import Path import numpy as np import sigmf from sigmf import SigMFFile, error, utils -from sigmf.sigmffile import _DeprecatingKey, _SigMFDeprecatingMeta from .testdata import ( TEST_FLOAT32_DATA, diff --git a/tests/testdata.py b/tests/testdata.py index b442c79..3abed97 100644 --- a/tests/testdata.py +++ b/tests/testdata.py @@ -6,12 +6,10 @@ """Shared test data for tests.""" -from pathlib import Path - import numpy as np import sigmf -from sigmf import SigMFFile, __specification__, __version__ +from sigmf import SigMFFile, __specification__ TEST_FLOAT32_DATA = np.arange(16, dtype=np.float32) TEST_METADATA = { From 9ec87b6f205ad7e5bd175b2e45625eb902304e4c Mon Sep 17 00:00:00 2001 From: Teque5 Date: Sat, 30 May 2026 22:13:09 -0700 Subject: [PATCH 2/3] address more pylint nitpicks --- sigmf/convert/signalhound.py | 2 +- sigmf/sigmffile.py | 2 +- tests/test_convert_blue.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sigmf/convert/signalhound.py b/sigmf/convert/signalhound.py index e0b2044..db3289f 100644 --- a/sigmf/convert/signalhound.py +++ b/sigmf/convert/signalhound.py @@ -76,7 +76,7 @@ def validate_spike(xml_path: Path) -> None: # validate CenterFrequency center_freq_raw = _text_of(root, "CenterFrequency") try: - center_frequency = float(center_freq_raw) + float(center_freq_raw) except (TypeError, ValueError) as err: raise SigMFConversionError(f"Invalid or missing CenterFrequency: {center_freq_raw}") from err diff --git a/sigmf/sigmffile.py b/sigmf/sigmffile.py index c4b6887..8dc300e 100644 --- a/sigmf/sigmffile.py +++ b/sigmf/sigmffile.py @@ -1195,7 +1195,7 @@ def tofile(self, file_path, pretty: bool = True, overwrite: bool = False) -> Non def get_SigMFFile(self, stream_name=None, stream_index=None): """ - Returns the SigMFFile instance of the specified stream if it exists + Returns the SigMFFile instance of the specified stream if it exists, or None. """ if stream_name is not None and stream_name not in self.get_stream_names(): # invalid stream name diff --git a/tests/test_convert_blue.py b/tests/test_convert_blue.py index f13a6ef..d262208 100644 --- a/tests/test_convert_blue.py +++ b/tests/test_convert_blue.py @@ -61,11 +61,11 @@ def tearDown(self) -> None: """clean up temporary directory""" self.tmp_dir.cleanup() - def write_minimal(self, format: bytes = b"CF") -> None: + def write_minimal(self, fmt: bytes = b"CF") -> None: """write minimal BLUE file to self.blue_path""" - is_complex = format[0] == ord(b"C") - dtype = TYPE_MAP[chr(format[1])] + is_complex = fmt[0] == ord(b"C") + dtype = TYPE_MAP[chr(fmt[1])] if np.issubdtype(dtype, np.integer): scale = 2 ** (np.dtype(dtype).itemsize * 8 - 1) @@ -108,7 +108,7 @@ def write_minimal(self, format: bytes = b"CF") -> None: handle.write(b"BLUEEEEIEEEI") # magic & endianness handle.seek(32) handle.write( - struct.pack(" Date: Sat, 30 May 2026 22:16:22 -0700 Subject: [PATCH 3/3] increment patch --- sigmf/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigmf/__init__.py b/sigmf/__init__.py index 2eb2868..360f47b 100644 --- a/sigmf/__init__.py +++ b/sigmf/__init__.py @@ -5,7 +5,7 @@ # SPDX-License-Identifier: LGPL-3.0-or-later # version of this python module -__version__ = "1.11.1" +__version__ = "1.11.2" # matching version of the SigMF specification __specification__ = "1.2.6"