Merge pull request #65 from scs/feature/update

Feature/update
scs · Mar 26, 2024 · 80e38db · 80e38db
2 parents d497a3e + 092151d
commit 80e38db
Show file tree

Hide file tree

Showing 37 changed files with 471 additions and 577 deletions.
diff --git a/Pipfile b/Pipfile
@@ -5,15 +5,17 @@ name = "pypi"
 
 [packages]
 aioserial = "~=1.3.1"
-asyncio-mqtt = "~=0.16.1"
-gurux-dlms = "==1.0.143"
+asyncio-mqtt = "~=0.16.2"
+gurux-dlms = "==1.0.150"
+paho-mqtt = "~=1.6.1"
 
 [dev-packages]
 autopep8 = "*"
 chardet = "*"
 isort = "*"
 licenseheaders = "*"
 pipenv-setup = "*"
+plette = "~=0.4"
 pylint = "*"
 pytest = "*"
 pytest-asyncio = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/debian/postinst b/debian/postinst
@@ -44,8 +44,8 @@ echo -n "Installing dependencies using pip.."
 # write a pip requirements.txt for automatic dependency installation
 echo "-i https://pypi.org/simple
 aioserial==1.3.1
-asyncio-mqtt==0.16.1
-gurux-dlms==1.0.143
+asyncio-mqtt==0.16.2
+gurux-dlms==1.0.150
 paho-mqtt==1.6.1
 pyserial==3.5" > /tmp/requirements.txt
 # install all required dependencies

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only
@@ -39,7 +39,6 @@
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
@@ -53,8 +52,8 @@
     include_package_data=True,
     install_requires=[
         'aioserial==1.3.1',
-        'asyncio-mqtt==0.16.1',
-        'gurux-dlms==1.0.143',
+        'asyncio-mqtt==0.16.2',
+        'gurux-dlms==1.0.150',
         'paho-mqtt==1.6.1',
         'pyserial==3.5'
     ],

diff --git a/smartmeter_datacollector/__init__.py b/smartmeter_datacollector/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/__main__.py b/smartmeter_datacollector/__main__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/__version__.py b/smartmeter_datacollector/__version__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/app.py b/smartmeter_datacollector/app.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/collector.py b/smartmeter_datacollector/collector.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/config.py b/smartmeter_datacollector/config.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/factory.py b/smartmeter_datacollector/factory.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/sinks/__init__.py b/smartmeter_datacollector/sinks/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/sinks/data_sink.py b/smartmeter_datacollector/sinks/data_sink.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/sinks/logger_sink.py b/smartmeter_datacollector/sinks/logger_sink.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/sinks/mqtt_sink.py b/smartmeter_datacollector/sinks/mqtt_sink.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/__init__.py b/smartmeter_datacollector/smartmeter/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/cosem.py b/smartmeter_datacollector/smartmeter/cosem.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/hdlc_dlms_parser.py b/smartmeter_datacollector/smartmeter/hdlc_dlms_parser.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/iskraam550.py b/smartmeter_datacollector/smartmeter/iskraam550.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/kamstrup_han.py b/smartmeter_datacollector/smartmeter/kamstrup_han.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2023 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/lge360.py b/smartmeter_datacollector/smartmeter/lge360.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/lge450.py b/smartmeter_datacollector/smartmeter/lge450.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/meter.py b/smartmeter_datacollector/smartmeter/meter.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/meter_data.py b/smartmeter_datacollector/smartmeter/meter_data.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/obis.py b/smartmeter_datacollector/smartmeter/obis.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/reader.py b/smartmeter_datacollector/smartmeter/reader.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/smartmeter_datacollector/smartmeter/serial_reader.py b/smartmeter_datacollector/smartmeter/serial_reader.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/tests/test_collector.py b/tests/test_collector.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only
@@ -22,7 +22,6 @@ def test_type() -> MeterDataPointType:
     return MeterDataPointType("TEST_TYPE", "test type", "unit")
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_collector_with_one_sink(mocker: MockerFixture, test_type: MeterDataPointType):
     coll = Collector()
@@ -39,7 +38,6 @@ async def test_collector_with_one_sink(mocker: MockerFixture, test_type: MeterDa
     sink.send.assert_awaited_once_with(data_point)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_collector_with_one_sink_multiple_data_points(mocker: MockerFixture, test_type: MeterDataPointType):
     coll = Collector()
@@ -58,7 +56,6 @@ async def test_collector_with_one_sink_multiple_data_points(mocker: MockerFixtur
     assert sink.send.await_count == 2
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_collector_with_two_sinks(mocker: MockerFixture, test_type: MeterDataPointType):
     coll = Collector()

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/tests/test_hdlc_dlms_parser.py b/tests/test_hdlc_dlms_parser.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/tests/test_iskraam550.py b/tests/test_iskraam550.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only
@@ -17,7 +17,6 @@
 from .utils import *
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_iskaam550_initialization(mocker: MockerFixture):
     observer = mocker.stub()
@@ -33,7 +32,6 @@ async def test_iskaam550_initialization(mocker: MockerFixture):
     observer.assert_not_called
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_iskraam550_parse_and_provide_unencrypted_data(mocker: MockerFixture,
                                                              unencrypted_valid_data_iskra: List[bytes]):

diff --git a/tests/test_lge450.py b/tests/test_lge450.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only
@@ -17,7 +17,6 @@
 from .utils import *
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_lge450_initialization(mocker: MockerFixture):
     observer = mocker.stub()
@@ -33,7 +32,6 @@ async def test_lge450_initialization(mocker: MockerFixture):
     observer.assert_not_called
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_lge450_parse_and_provide_unencrypted_data(mocker: MockerFixture,
                                                          unencrypted_valid_data_lg: List[bytes]):
@@ -70,7 +68,6 @@ def data_received():
     assert all(data.timestamp.strftime(r"%m/%d/%y %H:%M:%S") == "07/06/21 14:58:18" for data in values)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_lge450_do_not_provide_invalid_data(mocker: MockerFixture,
                                                   unencrypted_invalid_data_lg: List[bytes]):

diff --git a/tests/test_meter_data.py b/tests/test_meter_data.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/tests/test_mqtt_sink.py b/tests/test_mqtt_sink.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only
@@ -22,7 +22,6 @@
 TEST_TYPE = MeterDataPointType("TEST_TYPE", "test type", "unit")
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_mqtt_sink_start_stop(mocker: MockerFixture):
     config = MqttConfig("localhost")
@@ -36,7 +35,6 @@ async def test_mqtt_sink_start_stop(mocker: MockerFixture):
     client_mock.disconnect.assert_awaited_once()
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_mqtt_sink_send_point_when_started(mocker: MockerFixture):
     config = MqttConfig("localhost")
@@ -55,7 +53,6 @@ async def test_mqtt_sink_send_point_when_started(mocker: MockerFixture):
     client_mock.publish.assert_awaited_once_with(expected_topic, expected_payload)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Python3.7 does not support AsyncMock.")
 @pytest.mark.asyncio
 async def test_mqtt_sink_send_reconnect_when_not_started(mocker: MockerFixture):
     config = MqttConfig("localhost")

diff --git a/tests/test_obis.py b/tests/test_obis.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only

diff --git a/tests/utils.py b/tests/utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 Supercomputing Systems AG
+# Copyright (C) 2024 Supercomputing Systems AG
 # This file is part of smartmeter-datacollector.
 #
 # SPDX-License-Identifier: GPL-2.0-only