From d2d715faa8dd551c3fd4dd999d62314344a04685 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Sep 2018 16:07:31 +0200 Subject: [PATCH] Upgrade wakeonlan to 1.1.6 (#16512) --- .../media_player/panasonic_viera.py | 2 +- .../components/media_player/samsungtv.py | 2 +- .../components/switch/wake_on_lan.py | 28 ++++++++----------- homeassistant/components/wake_on_lan.py | 5 ++-- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/media_player/panasonic_viera.py b/homeassistant/components/media_player/panasonic_viera.py index efe04c7005b..d3e56c4dfb1 100644 --- a/homeassistant/components/media_player/panasonic_viera.py +++ b/homeassistant/components/media_player/panasonic_viera.py @@ -18,7 +18,7 @@ from homeassistant.const import ( STATE_UNKNOWN) import homeassistant.helpers.config_validation as cv -REQUIREMENTS = ['panasonic_viera==0.3.1', 'wakeonlan==1.0.0'] +REQUIREMENTS = ['panasonic_viera==0.3.1', 'wakeonlan==1.1.6'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/media_player/samsungtv.py b/homeassistant/components/media_player/samsungtv.py index cc966c0d263..c0a5d617f19 100644 --- a/homeassistant/components/media_player/samsungtv.py +++ b/homeassistant/components/media_player/samsungtv.py @@ -24,7 +24,7 @@ from homeassistant.const import ( import homeassistant.helpers.config_validation as cv from homeassistant.util import dt as dt_util -REQUIREMENTS = ['samsungctl[websocket]==0.7.1', 'wakeonlan==1.0.0'] +REQUIREMENTS = ['samsungctl[websocket]==0.7.1', 'wakeonlan==1.1.6'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/switch/wake_on_lan.py b/homeassistant/components/switch/wake_on_lan.py index 06f86865064..16bd700e1d5 100644 --- a/homeassistant/components/switch/wake_on_lan.py +++ b/homeassistant/components/switch/wake_on_lan.py @@ -10,26 +10,26 @@ import subprocess as sp import voluptuous as vol -from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA) +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice +from homeassistant.const import CONF_HOST, CONF_NAME import homeassistant.helpers.config_validation as cv from homeassistant.helpers.script import Script -from homeassistant.const import (CONF_HOST, CONF_NAME) -REQUIREMENTS = ['wakeonlan==1.0.0'] +REQUIREMENTS = ['wakeonlan==1.1.6'] _LOGGER = logging.getLogger(__name__) +CONF_BROADCAST_ADDRESS = 'broadcast_address' CONF_MAC_ADDRESS = 'mac_address' CONF_OFF_ACTION = 'turn_off' -CONF_BROADCAST_ADDRESS = 'broadcast_address' DEFAULT_NAME = 'Wake on LAN' DEFAULT_PING_TIMEOUT = 1 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ vol.Required(CONF_MAC_ADDRESS): cv.string, - vol.Optional(CONF_HOST): cv.string, vol.Optional(CONF_BROADCAST_ADDRESS): cv.string, + vol.Optional(CONF_HOST): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_OFF_ACTION): cv.SCRIPT_SCHEMA, }) @@ -37,21 +37,22 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ def setup_platform(hass, config, add_entities, discovery_info=None): """Set up a wake on lan switch.""" - name = config.get(CONF_NAME) + broadcast_address = config.get(CONF_BROADCAST_ADDRESS) host = config.get(CONF_HOST) mac_address = config.get(CONF_MAC_ADDRESS) - broadcast_address = config.get(CONF_BROADCAST_ADDRESS) + name = config.get(CONF_NAME) off_action = config.get(CONF_OFF_ACTION) - add_entities([WOLSwitch(hass, name, host, mac_address, - off_action, broadcast_address)], True) + add_entities([WOLSwitch( + hass, name, host, mac_address, off_action, broadcast_address)], True) class WOLSwitch(SwitchDevice): """Representation of a wake on lan switch.""" - def __init__(self, hass, name, host, mac_address, - off_action, broadcast_address): + def __init__( + self, hass, name, host, mac_address, off_action, + broadcast_address): """Initialize the WOL switch.""" import wakeonlan self._hass = hass @@ -63,11 +64,6 @@ class WOLSwitch(SwitchDevice): self._state = False self._wol = wakeonlan - @property - def should_poll(self): - """Return the polling state.""" - return True - @property def is_on(self): """Return true if switch is on.""" diff --git a/homeassistant/components/wake_on_lan.py b/homeassistant/components/wake_on_lan.py index 4e729c7ccc7..5bcb0d4dd79 100644 --- a/homeassistant/components/wake_on_lan.py +++ b/homeassistant/components/wake_on_lan.py @@ -13,11 +13,12 @@ import voluptuous as vol from homeassistant.const import CONF_MAC import homeassistant.helpers.config_validation as cv -REQUIREMENTS = ['wakeonlan==1.0.0'] +REQUIREMENTS = ['wakeonlan==1.1.6'] -DOMAIN = "wake_on_lan" _LOGGER = logging.getLogger(__name__) +DOMAIN = 'wake_on_lan' + CONF_BROADCAST_ADDRESS = 'broadcast_address' SERVICE_SEND_MAGIC_PACKET = 'send_magic_packet' diff --git a/requirements_all.txt b/requirements_all.txt index 358f5ac2244..af51d0870cd 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1461,7 +1461,7 @@ vultr==0.1.2 # homeassistant.components.media_player.panasonic_viera # homeassistant.components.media_player.samsungtv # homeassistant.components.switch.wake_on_lan -wakeonlan==1.0.0 +wakeonlan==1.1.6 # homeassistant.components.sensor.waqi waqiasync==1.0.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 9f875118b2e..736ba9115e4 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -222,7 +222,7 @@ vultr==0.1.2 # homeassistant.components.media_player.panasonic_viera # homeassistant.components.media_player.samsungtv # homeassistant.components.switch.wake_on_lan -wakeonlan==1.0.0 +wakeonlan==1.1.6 # homeassistant.components.cloud warrant==0.6.1