Refactor

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile = black

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],

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"
 

misc/test_bleuart.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from feasycom_ble import BTLEUart
+from srnemqtt import MAC, construct_request, write
-from solar_ble import MAC, construct_request, write
+from srnemqtt.feasycom_ble import BTLEUart
 
 with BTLEUart(MAC, timeout=1) as x:
 

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 .config import get_config, get_consumers
-from solar_types import DATA_BATTERY_STATE, HISTORICAL_DATA, DataItem, DataName
+from .feasycom_ble import BTLEUart
-from test_config import get_config, get_consumers
+from .solar_types import DATA_BATTERY_STATE, HISTORICAL_DATA, DataItem, DataName
 
 MAC = "DC:0D:30:9C:61:BA"
 

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]]:

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]] = {

tox.ini

@@ -1,6 +1,3 @@
 [flake8]
 max-line-length = 88
 extend-ignore = E203, I201, I101
-
-[tool.isort]
-profile = "black"