mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 13:17:32 +00:00
Upgrade to dsmr_parser 0.8, supporting protocol 3 and 5. (#6600)
* Upgrade to dsmr_parser 0.8, supporting protocol 3 and 5. * Update tests for new import.
This commit is contained in:
parent
4d9c7d9684
commit
bd3fbe8363
@ -40,7 +40,7 @@ import voluptuous as vol
|
|||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
REQUIREMENTS = ['dsmr_parser==0.6']
|
REQUIREMENTS = ['dsmr_parser==0.8']
|
||||||
|
|
||||||
CONF_DSMR_VERSION = 'dsmr_version'
|
CONF_DSMR_VERSION = 'dsmr_version'
|
||||||
CONF_RECONNECT_INTERVAL = 'reconnect_interval'
|
CONF_RECONNECT_INTERVAL = 'reconnect_interval'
|
||||||
@ -72,7 +72,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
|
|||||||
logging.getLogger('dsmr_parser').setLevel(logging.ERROR)
|
logging.getLogger('dsmr_parser').setLevel(logging.ERROR)
|
||||||
|
|
||||||
from dsmr_parser import obis_references as obis_ref
|
from dsmr_parser import obis_references as obis_ref
|
||||||
from dsmr_parser.protocol import create_dsmr_reader, create_tcp_dsmr_reader
|
from dsmr_parser.clients.protocol import (create_dsmr_reader,
|
||||||
|
create_tcp_dsmr_reader)
|
||||||
import serial
|
import serial
|
||||||
|
|
||||||
dsmr_version = config[CONF_DSMR_VERSION]
|
dsmr_version = config[CONF_DSMR_VERSION]
|
||||||
|
@ -124,7 +124,7 @@ dnspython3==1.15.0
|
|||||||
dovado==0.4.1
|
dovado==0.4.1
|
||||||
|
|
||||||
# homeassistant.components.sensor.dsmr
|
# homeassistant.components.sensor.dsmr
|
||||||
dsmr_parser==0.6
|
dsmr_parser==0.8
|
||||||
|
|
||||||
# homeassistant.components.dweet
|
# homeassistant.components.dweet
|
||||||
# homeassistant.components.sensor.dweet
|
# homeassistant.components.sensor.dweet
|
||||||
|
@ -20,7 +20,7 @@ from tests.common import assert_setup_component
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def mock_connection_factory(monkeypatch):
|
def mock_connection_factory(monkeypatch):
|
||||||
"""Mock the create functions for serial and TCP Asyncio connections."""
|
"""Mock the create functions for serial and TCP Asyncio connections."""
|
||||||
from dsmr_parser.protocol import DSMRProtocol
|
from dsmr_parser.clients.protocol import DSMRProtocol
|
||||||
transport = asynctest.Mock(spec=asyncio.Transport)
|
transport = asynctest.Mock(spec=asyncio.Transport)
|
||||||
protocol = asynctest.Mock(spec=DSMRProtocol)
|
protocol = asynctest.Mock(spec=DSMRProtocol)
|
||||||
|
|
||||||
@ -32,10 +32,10 @@ def mock_connection_factory(monkeypatch):
|
|||||||
|
|
||||||
# apply the mock to both connection factories
|
# apply the mock to both connection factories
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
'dsmr_parser.protocol.create_dsmr_reader',
|
'dsmr_parser.clients.protocol.create_dsmr_reader',
|
||||||
connection_factory)
|
connection_factory)
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
'dsmr_parser.protocol.create_tcp_dsmr_reader',
|
'dsmr_parser.clients.protocol.create_tcp_dsmr_reader',
|
||||||
connection_factory)
|
connection_factory)
|
||||||
|
|
||||||
return connection_factory, transport, protocol
|
return connection_factory, transport, protocol
|
||||||
@ -161,7 +161,7 @@ def test_connection_errors_retry(hass, monkeypatch, mock_connection_factory):
|
|||||||
TimeoutError])
|
TimeoutError])
|
||||||
|
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
'dsmr_parser.protocol.create_dsmr_reader',
|
'dsmr_parser.clients.protocol.create_dsmr_reader',
|
||||||
first_fail_connection_factory)
|
first_fail_connection_factory)
|
||||||
yield from async_setup_component(hass, 'sensor', {'sensor': config})
|
yield from async_setup_component(hass, 'sensor', {'sensor': config})
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user