jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump dsmr-parser dependency to 0.32 (#63436)

Browse Source
This commit is contained in:
rhpijnacker 2022-01-05 22:50:00 +01:00 committed by GitHub
parent 2969a7ab4f
commit 32c416b646
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
homeassistant/components/dsmr/const.py
View File

@ -241,42 +241,18 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
state_class=SensorStateClass.MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
entity_category=EntityCategory.DIAGNOSTIC, entity_category=EntityCategory.DIAGNOSTIC,
), ),
DSMRSensorEntityDescription(
key=obis_references.LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL,
name="Energy Consumption (total)",
dsmr_versions={"5L"},
force_update=True,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING,
),
DSMRSensorEntityDescription(
key=obis_references.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL,
name="Energy Production (total)",
dsmr_versions={"5L"},
force_update=True,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING,
),
DSMRSensorEntityDescription(
key=obis_references.SWEDEN_ELECTRICITY_USED_TARIFF_GLOBAL,
name="Energy Consumption (total)",
dsmr_versions={"5S"},
force_update=True,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING,
),
DSMRSensorEntityDescription(
key=obis_references.SWEDEN_ELECTRICITY_DELIVERED_TARIFF_GLOBAL,
name="Energy Production (total)",
dsmr_versions={"5S"},
force_update=True,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING,
),
DSMRSensorEntityDescription( DSMRSensorEntityDescription(
key=obis_references.ELECTRICITY_IMPORTED_TOTAL, key=obis_references.ELECTRICITY_IMPORTED_TOTAL,
name="Energy Consumption (total)", name="Energy Consumption (total)",
dsmr_versions={"2.2", "4", "5", "5B"}, dsmr_versions={"5", "5B", "5L", "5S"},
force_update=True,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING,
),
DSMRSensorEntityDescription(
key=obis_references.ELECTRICITY_EXPORTED_TOTAL,
name="Energy Production (total)",
dsmr_versions={"5L", "5S"},
force_update=True, force_update=True,
device_class=SensorDeviceClass.ENERGY, device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING, state_class=SensorStateClass.TOTAL_INCREASING,

2
homeassistant/components/dsmr/manifest.json
View File

@ -2,7 +2,7 @@
"domain": "dsmr", "domain": "dsmr",
"name": "DSMR Slimme Meter", "name": "DSMR Slimme Meter",
"documentation": "https://www.home-assistant.io/integrations/dsmr", "documentation": "https://www.home-assistant.io/integrations/dsmr",
"requirements": ["dsmr_parser==0.31"], "requirements": ["dsmr_parser==0.32"],
"codeowners": ["@Robbie1221", "@frenck"], "codeowners": ["@Robbie1221", "@frenck"],
"config_flow": true, "config_flow": true,
"iot_class": "local_push" "iot_class": "local_push"

2
requirements_all.txt
View File

@ -569,7 +569,7 @@ doorbirdpy==2.1.0
dovado==0.4.1 dovado==0.4.1
# homeassistant.components.dsmr # homeassistant.components.dsmr
dsmr_parser==0.31 dsmr_parser==0.32
# homeassistant.components.dwd_weather_warnings # homeassistant.components.dwd_weather_warnings
dwdwfsapi==1.0.4 dwdwfsapi==1.0.4

2
requirements_test_all.txt
View File

@ -364,7 +364,7 @@ directv==0.4.0
doorbirdpy==2.1.0 doorbirdpy==2.1.0
# homeassistant.components.dsmr # homeassistant.components.dsmr
dsmr_parser==0.31 dsmr_parser==0.32
# homeassistant.components.dynalite # homeassistant.components.dynalite
dynalite_devices==0.1.46 dynalite_devices==0.1.46

16
tests/components/dsmr/test_sensor.py
View File

@ -309,9 +309,9 @@ async def test_luxembourg_meter(hass, dsmr_connection_fixture):
(connection_factory, transport, protocol) = dsmr_connection_fixture (connection_factory, transport, protocol) = dsmr_connection_fixture
from dsmr_parser.obis_references import ( from dsmr_parser.obis_references import (
ELECTRICITY_EXPORTED_TOTAL,
ELECTRICITY_IMPORTED_TOTAL,
HOURLY_GAS_METER_READING, HOURLY_GAS_METER_READING,
LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL,
LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL,
) )
from dsmr_parser.objects import CosemObject, MBusObject from dsmr_parser.objects import CosemObject, MBusObject
@ -334,10 +334,10 @@ async def test_luxembourg_meter(hass, dsmr_connection_fixture):
{"value": Decimal(745.695), "unit": "m3"}, {"value": Decimal(745.695), "unit": "m3"},
] ]
), ),
LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL: CosemObject( ELECTRICITY_IMPORTED_TOTAL: CosemObject(
[{"value": Decimal(123.456), "unit": ENERGY_KILO_WATT_HOUR}] [{"value": Decimal(123.456), "unit": ENERGY_KILO_WATT_HOUR}]
), ),
LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: CosemObject( ELECTRICITY_EXPORTED_TOTAL: CosemObject(
[{"value": Decimal(654.321), "unit": ENERGY_KILO_WATT_HOUR}] [{"value": Decimal(654.321), "unit": ENERGY_KILO_WATT_HOUR}]
), ),
} }
@ -510,8 +510,8 @@ async def test_swedish_meter(hass, dsmr_connection_fixture):
(connection_factory, transport, protocol) = dsmr_connection_fixture (connection_factory, transport, protocol) = dsmr_connection_fixture
from dsmr_parser.obis_references import ( from dsmr_parser.obis_references import (
SWEDEN_ELECTRICITY_DELIVERED_TARIFF_GLOBAL, ELECTRICITY_EXPORTED_TOTAL,
SWEDEN_ELECTRICITY_USED_TARIFF_GLOBAL, ELECTRICITY_IMPORTED_TOTAL,
) )
from dsmr_parser.objects import CosemObject from dsmr_parser.objects import CosemObject
@ -528,10 +528,10 @@ async def test_swedish_meter(hass, dsmr_connection_fixture):
} }
telegram = { telegram = {
SWEDEN_ELECTRICITY_USED_TARIFF_GLOBAL: CosemObject( ELECTRICITY_IMPORTED_TOTAL: CosemObject(
[{"value": Decimal(123.456), "unit": ENERGY_KILO_WATT_HOUR}] [{"value": Decimal(123.456), "unit": ENERGY_KILO_WATT_HOUR}]
), ),
SWEDEN_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: CosemObject( ELECTRICITY_EXPORTED_TOTAL: CosemObject(
[{"value": Decimal(654.321), "unit": ENERGY_KILO_WATT_HOUR}] [{"value": Decimal(654.321), "unit": ENERGY_KILO_WATT_HOUR}]
), ),
} }