From a2905073a84a0a4bff95844b4dbde8fcd6c2197f Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 12 Sep 2025 15:49:37 -0400 Subject: [PATCH] Moving external `libhackrf.py` module into `_external/` folder and updating Flake8 and Black config to ignore --- pyproject.toml | 3 ++- src/ria_toolkit_oss/sdr/{ => _external}/libhackrf.py | 3 +-- src/ria_toolkit_oss/sdr/hackrf.py | 3 +-- tox.ini | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) rename src/ria_toolkit_oss/sdr/{ => _external}/libhackrf.py (96%) diff --git a/pyproject.toml b/pyproject.toml index adcb9de..c159483 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,7 +83,7 @@ target-version = ["py310"] exclude = ''' /( \.git - | \.github + | \.riahub | \.tox | build | dist @@ -94,6 +94,7 @@ exclude = ''' | \.env | \.idea | \.vscode + | _external )/ ''' diff --git a/src/ria_toolkit_oss/sdr/libhackrf.py b/src/ria_toolkit_oss/sdr/_external/libhackrf.py similarity index 96% rename from src/ria_toolkit_oss/sdr/libhackrf.py rename to src/ria_toolkit_oss/sdr/_external/libhackrf.py index 6c6f6cd..905ce8b 100644 --- a/src/ria_toolkit_oss/sdr/libhackrf.py +++ b/src/ria_toolkit_oss/sdr/_external/libhackrf.py @@ -1,5 +1,4 @@ -# TODO: only use transfer->valid_length in callbacks -# TODO: make error messages more informative +# Original work by Dressel, from the pyhackrf project: https://github.com/dressel/pyhackrf import logging import os diff --git a/src/ria_toolkit_oss/sdr/hackrf.py b/src/ria_toolkit_oss/sdr/hackrf.py index 2e2943e..349e4fc 100644 --- a/src/ria_toolkit_oss/sdr/hackrf.py +++ b/src/ria_toolkit_oss/sdr/hackrf.py @@ -5,10 +5,9 @@ from typing import Optional import numpy as np from ria_toolkit_oss.datatypes.recording import Recording +from ria_toolkit_oss.sdr._external.libhackrf import HackRF as hrf from ria_toolkit_oss.sdr.sdr import SDR -from .libhackrf import HackRF as hrf - class HackRF(SDR): def __init__(self, identifier=""): diff --git a/tox.ini b/tox.ini index b61f05e..107b46b 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ commands = [flake8] max-line-length = 119 extend-ignore = W503, E203, E701 -exclude = .git, .github, build, dist, docs, venv, .venv, env, .env, .idea, .vscode, .tox +exclude = .git, .riahub, build, dist, docs, venv, .venv, env, .env, .idea, .vscode, .tox, _external max-complexity = 15 per-file-ignores = __init__.py:F401