diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000..f238bf7 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,2 @@ +[settings] +profile = black diff --git a/misc/draw_memory_map.py b/misc/draw_memory_map.py index a15811c..b676542 100644 --- a/misc/draw_memory_map.py +++ b/misc/draw_memory_map.py @@ -2,9 +2,10 @@ from ast import literal_eval from typing import Iterable, List -from solar_ble import parse_packet from table_drawing import table +from srnemqtt import parse_packet + def memory_table( data: Iterable[int], diff --git a/misc/render_rrd.py b/misc/render_rrd.py index e5d97e8..2ca196e 100644 --- a/misc/render_rrd.py +++ b/misc/render_rrd.py @@ -7,7 +7,7 @@ from typing import Any, Dict import rrdtool -from solar_types import DataName +from srnemqtt.solar_types import DataName DT_FORMAT = "%Y-%m-%d %H:%M:%S.%f" diff --git a/misc/test_bleuart.py b/misc/test_bleuart.py index 0f9fb21..028ebe0 100644 --- a/misc/test_bleuart.py +++ b/misc/test_bleuart.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from feasycom_ble import BTLEUart -from solar_ble import MAC, construct_request, write +from srnemqtt import MAC, construct_request, write +from srnemqtt.feasycom_ble import BTLEUart with BTLEUart(MAC, timeout=1) as x: diff --git a/srnemqtt/__init__.py b/srnemqtt/__init__.py index a0518b1..918319d 100755 --- a/srnemqtt/__init__.py +++ b/srnemqtt/__init__.py @@ -12,9 +12,9 @@ from typing import Callable, Collection, Optional, cast from bluepy import btle from libscrc import modbus -from feasycom_ble import BTLEUart -from solar_types import DATA_BATTERY_STATE, HISTORICAL_DATA, DataItem, DataName -from test_config import get_config, get_consumers +from .config import get_config, get_consumers +from .feasycom_ble import BTLEUart +from .solar_types import DATA_BATTERY_STATE, HISTORICAL_DATA, DataItem, DataName MAC = "DC:0D:30:9C:61:BA" diff --git a/srnemqtt/config.py b/srnemqtt/config.py index e555bb7..ccff24d 100644 --- a/srnemqtt/config.py +++ b/srnemqtt/config.py @@ -6,7 +6,7 @@ from typing import Any, Dict, List, Optional, Type import yaml -from consumers import BaseConsumer +from .consumers import BaseConsumer def get_consumer(name: str) -> Optional[Type[BaseConsumer]]: diff --git a/srnemqtt/consumers/mqtt.py b/srnemqtt/consumers/mqtt.py index 5d471fc..6cd7497 100644 --- a/srnemqtt/consumers/mqtt.py +++ b/srnemqtt/consumers/mqtt.py @@ -6,8 +6,7 @@ from uuid import uuid4 import paho.mqtt.client as mqtt -from solar_types import DataName - +from ..solar_types import DataName from . import BaseConsumer MAP_VALUES: Dict[DataName, Dict[str, Any]] = { diff --git a/tox.ini b/tox.ini index 7772898..edfab12 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,3 @@ [flake8] max-line-length = 88 extend-ignore = E203, I201, I101 - -[tool.isort] -profile = "black"