evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade psutil to 5.6.1 (#22183)

Browse source 
* Upgrade psutil to 5.6.1

* Upgrade speedtest-cli to 2.1.1
This commit is contained in:
Fabian Affolter 2019-03-21 04:30:52 +01:00 • committed by Paulus Schoutsen
parent 9653544144
commit e044eace20
4 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

33
homeassistant/components/speedtestdotnet/__init__.py
View file

@ -1,21 +1,21 @@
"""Support for testing internet speed via Speedtest.net.""" """Support for testing internet speed via Speedtest.net."""
import logging
from datetime import timedelta from datetime import timedelta
import logging
import voluptuous as vol 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 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.discovery import async_load_platform
from homeassistant.helpers.dispatcher import dispatcher_send from homeassistant.helpers.dispatcher import dispatcher_send
from homeassistant.helpers.event import async_track_time_interval 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__) _LOGGER = logging.getLogger(__name__)
@ -34,8 +34,7 @@ CONFIG_SCHEMA = vol.Schema({
vol.All(cv.time_period, cv.positive_timedelta), vol.All(cv.time_period, cv.positive_timedelta),
vol.Optional(CONF_MANUAL, default=False): cv.boolean, vol.Optional(CONF_MANUAL, default=False): cv.boolean,
vol.Optional( vol.Optional(
CONF_MONITORED_CONDITIONS, CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)
default=list(SENSOR_TYPES)
): vol.All(cv.ensure_list, [vol.In(list(SENSOR_TYPES))]) ): vol.All(cv.ensure_list, [vol.In(list(SENSOR_TYPES))])
}), }),
cv.deprecated( cv.deprecated(
@ -55,8 +54,7 @@ async def async_setup(hass, config):
if not conf[CONF_MANUAL]: if not conf[CONF_MANUAL]:
async_track_time_interval( async_track_time_interval(
hass, data.update, conf[CONF_SCAN_INTERVAL] hass, data.update, conf[CONF_SCAN_INTERVAL])
)
def update(call=None): def update(call=None):
"""Service call to manually update the data.""" """Service call to manually update the data."""
@ -66,13 +64,8 @@ async def async_setup(hass, config):
hass.async_create_task( hass.async_create_task(
async_load_platform( async_load_platform(
hass, hass, SENSOR_DOMAIN, DOMAIN, conf[CONF_MONITORED_CONDITIONS],
SENSOR_DOMAIN, config))
DOMAIN,
conf[CONF_MONITORED_CONDITIONS],
config
)
)
return True return True
@ -89,7 +82,7 @@ class SpeedtestData:
def update(self, now=None): def update(self, now=None):
"""Get the latest data from speedtest.net.""" """Get the latest data from speedtest.net."""
import speedtest import speedtest
_LOGGER.debug("Executing speedtest.net speedtest") _LOGGER.debug("Executing speedtest.net speed test")
speed = speedtest.Speedtest() speed = speedtest.Speedtest()
speed.get_servers(self._servers) speed.get_servers(self._servers)
speed.get_best_server() speed.get_best_server()

4
homeassistant/components/speedtestdotnet/sensor.py
View file

@ -1,8 +1,8 @@
"""Support for Speedtest.net internet speed testing sensor.""" """Support for Speedtest.net internet speed testing sensor."""
import logging import logging
from homeassistant.components.speedtestdotnet.const import \ from homeassistant.components.speedtestdotnet.const import (
DOMAIN as SPEEDTESTDOTNET_DOMAIN, DATA_UPDATED, SENSOR_TYPES DATA_UPDATED, DOMAIN as SPEEDTESTDOTNET_DOMAIN, SENSOR_TYPES)
from homeassistant.const import ATTR_ATTRIBUTION from homeassistant.const import ATTR_ATTRIBUTION
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.dispatcher import async_dispatcher_connect

2
homeassistant/components/systemmonitor/sensor.py
View file

@ -12,7 +12,7 @@ from homeassistant.helpers.entity import Entity
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
REQUIREMENTS = ['psutil==5.5.1'] REQUIREMENTS = ['psutil==5.6.1']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

4
requirements_all.txt
View file

@ -872,7 +872,7 @@ prometheus_client==0.2.0
protobuf==3.6.1 protobuf==3.6.1
# homeassistant.components.systemmonitor.sensor # homeassistant.components.systemmonitor.sensor
psutil==5.5.1 psutil==5.6.1
# homeassistant.components.wink # homeassistant.components.wink
pubnubsub-handler==1.0.3 pubnubsub-handler==1.0.3
@ -1619,7 +1619,7 @@ solaredge==0.0.2
somecomfort==0.5.2 somecomfort==0.5.2
# homeassistant.components.speedtestdotnet # homeassistant.components.speedtestdotnet
speedtest-cli==2.0.2 speedtest-cli==2.1.1
# homeassistant.components.spider # homeassistant.components.spider
spiderpy==1.3.1 spiderpy==1.3.1