diff --git a/homeassistant/components/speedtestdotnet/__init__.py b/homeassistant/components/speedtestdotnet/__init__.py index 4eae738b0d3..0c8908a309f 100644 --- a/homeassistant/components/speedtestdotnet/__init__.py +++ b/homeassistant/components/speedtestdotnet/__init__.py @@ -1,21 +1,21 @@ """Support for testing internet speed via Speedtest.net.""" -import logging from datetime import timedelta +import logging import voluptuous as vol +from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN +from homeassistant.components.speedtestdotnet.const import ( + DATA_UPDATED, DOMAIN, SENSOR_TYPES) +from homeassistant.const import ( + CONF_MONITORED_CONDITIONS, CONF_SCAN_INTERVAL, CONF_UPDATE_INTERVAL, + CONF_UPDATE_INTERVAL_INVALIDATION_VERSION) import homeassistant.helpers.config_validation as cv -from homeassistant.components.speedtestdotnet.const import DOMAIN, \ - DATA_UPDATED, SENSOR_TYPES -from homeassistant.const import CONF_MONITORED_CONDITIONS, \ - CONF_UPDATE_INTERVAL, CONF_SCAN_INTERVAL, \ - CONF_UPDATE_INTERVAL_INVALIDATION_VERSION from homeassistant.helpers.discovery import async_load_platform from homeassistant.helpers.dispatcher import dispatcher_send from homeassistant.helpers.event import async_track_time_interval -from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN -REQUIREMENTS = ['speedtest-cli==2.0.2'] +REQUIREMENTS = ['speedtest-cli==2.1.1'] _LOGGER = logging.getLogger(__name__) @@ -34,8 +34,7 @@ CONFIG_SCHEMA = vol.Schema({ vol.All(cv.time_period, cv.positive_timedelta), vol.Optional(CONF_MANUAL, default=False): cv.boolean, vol.Optional( - CONF_MONITORED_CONDITIONS, - default=list(SENSOR_TYPES) + CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES) ): vol.All(cv.ensure_list, [vol.In(list(SENSOR_TYPES))]) }), cv.deprecated( @@ -55,8 +54,7 @@ async def async_setup(hass, config): if not conf[CONF_MANUAL]: async_track_time_interval( - hass, data.update, conf[CONF_SCAN_INTERVAL] - ) + hass, data.update, conf[CONF_SCAN_INTERVAL]) def update(call=None): """Service call to manually update the data.""" @@ -66,13 +64,8 @@ async def async_setup(hass, config): hass.async_create_task( async_load_platform( - hass, - SENSOR_DOMAIN, - DOMAIN, - conf[CONF_MONITORED_CONDITIONS], - config - ) - ) + hass, SENSOR_DOMAIN, DOMAIN, conf[CONF_MONITORED_CONDITIONS], + config)) return True @@ -89,7 +82,7 @@ class SpeedtestData: def update(self, now=None): """Get the latest data from speedtest.net.""" import speedtest - _LOGGER.debug("Executing speedtest.net speedtest") + _LOGGER.debug("Executing speedtest.net speed test") speed = speedtest.Speedtest() speed.get_servers(self._servers) speed.get_best_server() diff --git a/homeassistant/components/speedtestdotnet/sensor.py b/homeassistant/components/speedtestdotnet/sensor.py index 4deb6550444..11bc9a37ca0 100644 --- a/homeassistant/components/speedtestdotnet/sensor.py +++ b/homeassistant/components/speedtestdotnet/sensor.py @@ -1,8 +1,8 @@ """Support for Speedtest.net internet speed testing sensor.""" import logging -from homeassistant.components.speedtestdotnet.const import \ - DOMAIN as SPEEDTESTDOTNET_DOMAIN, DATA_UPDATED, SENSOR_TYPES +from homeassistant.components.speedtestdotnet.const import ( + DATA_UPDATED, DOMAIN as SPEEDTESTDOTNET_DOMAIN, SENSOR_TYPES) from homeassistant.const import ATTR_ATTRIBUTION from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/systemmonitor/sensor.py b/homeassistant/components/systemmonitor/sensor.py index 8eccdc7b3b7..cf65daa4395 100644 --- a/homeassistant/components/systemmonitor/sensor.py +++ b/homeassistant/components/systemmonitor/sensor.py @@ -12,7 +12,7 @@ from homeassistant.helpers.entity import Entity import homeassistant.helpers.config_validation as cv import homeassistant.util.dt as dt_util -REQUIREMENTS = ['psutil==5.5.1'] +REQUIREMENTS = ['psutil==5.6.1'] _LOGGER = logging.getLogger(__name__) diff --git a/requirements_all.txt b/requirements_all.txt index 06ad5698223..a61f39e2084 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -872,7 +872,7 @@ prometheus_client==0.2.0 protobuf==3.6.1 # homeassistant.components.systemmonitor.sensor -psutil==5.5.1 +psutil==5.6.1 # homeassistant.components.wink pubnubsub-handler==1.0.3 @@ -1619,7 +1619,7 @@ solaredge==0.0.2 somecomfort==0.5.2 # homeassistant.components.speedtestdotnet -speedtest-cli==2.0.2 +speedtest-cli==2.1.1 # homeassistant.components.spider spiderpy==1.3.1