From fd4f8d92d2d258af8eb9b9073dd81b7359574385 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Jan 2020 23:35:28 +0100 Subject: [PATCH] Upgrade dsmr_parser to 0.18, re-enable tests (#31256) --- homeassistant/components/dsmr/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/dsmr/test_sensor.py | 12 ++---------- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/dsmr/manifest.json b/homeassistant/components/dsmr/manifest.json index 8f607dc299e..743bad148f0 100644 --- a/homeassistant/components/dsmr/manifest.json +++ b/homeassistant/components/dsmr/manifest.json @@ -2,7 +2,7 @@ "domain": "dsmr", "name": "DSMR Slimme Meter", "documentation": "https://www.home-assistant.io/integrations/dsmr", - "requirements": ["dsmr_parser==0.12"], + "requirements": ["dsmr_parser==0.18"], "dependencies": [], "codeowners": [] } diff --git a/requirements_all.txt b/requirements_all.txt index ef38a951db4..5099c2c6975 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -447,7 +447,7 @@ doorbirdpy==2.0.8 dovado==0.4.1 # homeassistant.components.dsmr -dsmr_parser==0.12 +dsmr_parser==0.18 # homeassistant.components.dweet dweepy==0.3.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index a9346f704b8..18886493f0d 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -162,7 +162,7 @@ directpy==0.5 distro==1.4.0 # homeassistant.components.dsmr -dsmr_parser==0.12 +dsmr_parser==0.18 # homeassistant.components.ee_brightbox eebrightbox==0.0.4 diff --git a/tests/components/dsmr/test_sensor.py b/tests/components/dsmr/test_sensor.py index 7000e2ab565..81249c04046 100644 --- a/tests/components/dsmr/test_sensor.py +++ b/tests/components/dsmr/test_sensor.py @@ -14,16 +14,10 @@ import asynctest import pytest from homeassistant.bootstrap import async_setup_component +from homeassistant.components.dsmr.sensor import DerivativeDSMREntity from tests.common import assert_setup_component -# Imports disabled due to missing PyCRC on PyPi -# Also disabled pylint/flake8 where this is used below -# from homeassistant.components.dsmr.sensor import DerivativeDSMREntity - - -pytest.skip("Dependency missing on PyPi", allow_module_level=True) - @pytest.fixture def mock_connection_factory(monkeypatch): @@ -103,9 +97,7 @@ async def test_derivative(): config = {"platform": "dsmr"} - # Disabled to satisfy pylint & flake8 caused by disabled import - # pylint: disable=undefined-variable - entity = DerivativeDSMREntity("test", "1.0.0", config) # noqa: F821 + entity = DerivativeDSMREntity("test", "1.0.0", config) await entity.async_update() assert entity.state is None, "initial state not unknown"