Skip to content

Commit cddde30

Browse files
raymar9raymar9
committed
change to absolute import paths
1 parent a4f5485 commit cddde30

17 files changed

Lines changed: 61 additions & 54 deletions

‎smartmeter_datacollector/__init__.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# Copyright (C) 2024 Supercomputing Systems AG
3+
# This file is part of smartmeter-datacollector.
4+
#
5+
# SPDX-License-Identifier: GPL-2.0-only
6+
# See LICENSES/README.md for more information.
7+
#

‎smartmeter_datacollector/app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from asyncio import CancelledError
1212
from configparser import ConfigParser
1313

14-
from . import config, factory
14+
from smartmeter_datacollector import config, factory
1515

1616
logging.basicConfig(level=logging.WARNING)
1717

‎smartmeter_datacollector/collector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from asyncio import QueueFull
1111
from typing import List
1212

13-
from .sinks.data_sink import DataSink
14-
from .smartmeter.meter_data import MeterDataPoint
13+
from smartmeter_datacollector.sinks.data_sink import DataSink
14+
from smartmeter_datacollector.smartmeter.meter_data import MeterDataPoint
1515

1616
LOGGER = logging.getLogger("collector")
1717

‎smartmeter_datacollector/factory.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
from configparser import ConfigParser
1010
from typing import List
1111

12-
from .collector import Collector
13-
from .config import InvalidConfigError
14-
from .sinks.data_sink import DataSink
15-
from .sinks.logger_sink import LoggerSink
16-
from .sinks.mqtt_sink import MqttConfig, MqttDataSink
17-
from .smartmeter.iskraam550 import IskraAM550
18-
from .smartmeter.kamstrup_han import KamstrupHAN
19-
from .smartmeter.lge360 import LGE360
20-
from .smartmeter.lge450 import LGE450
21-
from .smartmeter.lge570 import LGE570
22-
from .smartmeter.meter import Meter, MeterError
23-
from .smartmeter.siemens_td3511 import SiemensTD3511
12+
from smartmeter_datacollector.collector import Collector
13+
from smartmeter_datacollector.config import InvalidConfigError
14+
from smartmeter_datacollector.sinks.data_sink import DataSink
15+
from smartmeter_datacollector.sinks.logger_sink import LoggerSink
16+
from smartmeter_datacollector.sinks.mqtt_sink import MqttConfig, MqttDataSink
17+
from smartmeter_datacollector.smartmeter.iskraam550 import IskraAM550
18+
from smartmeter_datacollector.smartmeter.kamstrup_han import KamstrupHAN
19+
from smartmeter_datacollector.smartmeter.lge360 import LGE360
20+
from smartmeter_datacollector.smartmeter.lge450 import LGE450
21+
from smartmeter_datacollector.smartmeter.lge570 import LGE570
22+
from smartmeter_datacollector.smartmeter.meter import Meter, MeterError
23+
from smartmeter_datacollector.smartmeter.siemens_td3511 import SiemensTD3511
2424

2525

2626
def build_meters(config: ConfigParser) -> List[Meter]:

‎smartmeter_datacollector/sinks/data_sink.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
from abc import ABC, abstractmethod
99

10-
from ..smartmeter.meter_data import MeterDataPoint
10+
from smartmeter_datacollector.smartmeter.meter_data import MeterDataPoint
1111

1212

1313
class DataSink(ABC):

‎smartmeter_datacollector/sinks/logger_sink.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#
88
import logging
99

10-
from ..smartmeter.meter_data import MeterDataPoint
11-
from .data_sink import DataSink
10+
from smartmeter_datacollector.smartmeter.meter_data import MeterDataPoint
11+
from smartmeter_datacollector.sinks.data_sink import DataSink
1212

1313

1414
class LoggerSink(DataSink):

‎smartmeter_datacollector/sinks/mqtt_sink.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from asyncio_mqtt.error import MqttCodeError, MqttError
1818
from paho.mqtt.client import MQTT_ERR_NO_CONN
1919

20-
from ..smartmeter.meter_data import MeterDataPoint
21-
from .data_sink import DataSink
20+
from smartmeter_datacollector.smartmeter.meter_data import MeterDataPoint
21+
from smartmeter_datacollector.sinks.data_sink import DataSink
2222

2323
LOGGER = logging.getLogger("sink")
2424

‎smartmeter_datacollector/smartmeter/cosem.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from gurux_dlms import GXDateTime
1515
from gurux_dlms.objects import GXDLMSClock, GXDLMSData, GXDLMSRegister
1616

17-
from .meter_data import MeterDataPointType, MeterDataPointTypes
18-
from .obis import OBISCode
17+
from smartmeter_datacollector.smartmeter.meter_data import MeterDataPointType, MeterDataPointTypes
18+
from smartmeter_datacollector.smartmeter.obis import OBISCode
1919

2020
LOGGER = logging.getLogger("smartmeter")
2121

‎smartmeter_datacollector/smartmeter/hdlc_dlms_parser.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
GXDLMSPushSetup, GXDLMSRegister)
1616
from gurux_dlms.secure import GXDLMSSecureClient
1717

18-
from .cosem import Cosem
19-
from .meter_data import MeterDataPoint
20-
from .obis import OBISCode
18+
from smartmeter_datacollector.smartmeter.cosem import Cosem
19+
from smartmeter_datacollector.smartmeter.meter_data import MeterDataPoint
20+
from smartmeter_datacollector.smartmeter.obis import OBISCode
2121

2222
LOGGER = logging.getLogger("smartmeter")
2323

‎smartmeter_datacollector/smartmeter/iskraam550.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
import serial
1212

13-
from .cosem import Cosem
14-
from .meter import MeterError, SerialHdlcDlmsMeter
15-
from .reader import ReaderError
16-
from .serial_reader import SerialConfig
13+
from smartmeter_datacollector.smartmeter.cosem import Cosem
14+
from smartmeter_datacollector.smartmeter.meter import MeterError, SerialHdlcDlmsMeter
15+
from smartmeter_datacollector.smartmeter.reader import ReaderError
16+
from smartmeter_datacollector.smartmeter.serial_reader import SerialConfig
1717

1818
LOGGER = logging.getLogger("smartmeter")
1919

0 commit comments

Comments
 (0)