Skip to content

Commit

Permalink
Merge pull request #10990 from home-assistant/release-0-59-2
Browse files Browse the repository at this point in the history
0.59.2
  • Loading branch information
balloob committed Dec 6, 2017
2 parents 015cdd1 + 56c694b commit fa324dc
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 17 deletions.
5 changes: 3 additions & 2 deletions homeassistant/components/device_tracker/linksys_ap.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
import voluptuous as vol

import homeassistant.helpers.config_validation as cv
from homeassistant.components.device_tracker import DOMAIN, PLATFORM_SCHEMA
from homeassistant.components.device_tracker import (
DOMAIN, PLATFORM_SCHEMA, DeviceScanner)
from homeassistant.const import (
CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_VERIFY_SSL)

Expand All @@ -38,7 +39,7 @@ def get_scanner(hass, config):
return None


class LinksysAPDeviceScanner(object):
class LinksysAPDeviceScanner(DeviceScanner):
"""This class queries a Linksys Access Point."""

def __init__(self, config):
Expand Down
1 change: 1 addition & 0 deletions homeassistant/components/dominos.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ def update_closest_store(self):

def get_menu(self):
"""Return the products from the closest stores menu."""
self.update_closest_store()
if self.closest_store is None:
_LOGGER.warning('Cannot get menu. Store may be closed')
return []
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/frontend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -583,9 +583,9 @@ def _is_latest(js_option, request):

family_min_version = {
'Chrome': 50, # Probably can reduce this
'Firefox': 41, # Destructuring added in 41
'Firefox': 43, # Array.protopype.includes added in 43
'Opera': 40, # Probably can reduce this
'Edge': 14, # Maybe can reduce this
'Edge': 14, # Array.protopype.includes added in 14
'Safari': 10, # many features not supported by 9
}
version = family_min_version.get(useragent.browser.family)
Expand Down
4 changes: 3 additions & 1 deletion homeassistant/components/media_player/cast.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import homeassistant.helpers.config_validation as cv
import homeassistant.util.dt as dt_util

REQUIREMENTS = ['pychromecast==1.0.2']
# Do not upgrade to 1.0.2, it breaks a bunch of stuff
# https://github.com/home-assistant/home-assistant/issues/10926
REQUIREMENTS = ['pychromecast==0.8.2']

_LOGGER = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/tellduslive.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

DOMAIN = 'tellduslive'

REQUIREMENTS = ['tellduslive==0.10.3']
REQUIREMENTS = ['tellduslive==0.10.4']

_LOGGER = logging.getLogger(__name__)

Expand Down
16 changes: 9 additions & 7 deletions homeassistant/components/wink/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from homeassistant.config import load_yaml_config_file
from homeassistant.util.json import load_json, save_json

REQUIREMENTS = ['python-wink==1.7.0', 'pubnubsub-handler==1.0.2']
REQUIREMENTS = ['python-wink==1.7.1', 'pubnubsub-handler==1.0.2']

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -460,10 +460,11 @@ def service_handle(service):
sirens_to_set.append(siren)

for siren in sirens_to_set:
_man = siren.wink.device_manufacturer()
if (service.service != SERVICE_SET_AUTO_SHUTOFF and
service.service != SERVICE_ENABLE_SIREN and
siren.wink.device_manufacturer() != 'dome'):
_LOGGER.error("Service only valid for Dome sirens.")
(_man != 'dome' and _man != 'wink')):
_LOGGER.error("Service only valid for Dome or Wink sirens.")
return

if service.service == SERVICE_ENABLE_SIREN:
Expand Down Expand Up @@ -494,10 +495,11 @@ def service_handle(service):
component = EntityComponent(_LOGGER, DOMAIN, hass)

sirens = []
has_dome_siren = False
has_dome_or_wink_siren = False
for siren in pywink.get_sirens():
if siren.device_manufacturer() == "dome":
has_dome_siren = True
_man = siren.device_manufacturer()
if _man == "dome" or _man == "wink":
has_dome_or_wink_siren = True
_id = siren.object_id() + siren.name()
if _id not in hass.data[DOMAIN]['unique_ids']:
sirens.append(WinkSirenDevice(siren, hass))
Expand All @@ -514,7 +516,7 @@ def service_handle(service):
descriptions.get(SERVICE_ENABLE_SIREN),
schema=ENABLED_SIREN_SCHEMA)

if has_dome_siren:
if has_dome_or_wink_siren:

hass.services.register(DOMAIN, SERVICE_SET_SIREN_TONE,
service_handle,
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"""Constants used by Home Assistant components."""
MAJOR_VERSION = 0
MINOR_VERSION = 59
PATCH_VERSION = '1'
PATCH_VERSION = '2'
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 4, 2)
Expand Down
6 changes: 3 additions & 3 deletions requirements_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ pybbox==0.0.5-alpha
# pybluez==0.22

# homeassistant.components.media_player.cast
pychromecast==1.0.2
pychromecast==0.8.2

# homeassistant.components.media_player.cmus
pycmus==0.1.0
Expand Down Expand Up @@ -883,7 +883,7 @@ python-velbus==2.0.11
python-vlc==1.1.2

# homeassistant.components.wink
python-wink==1.7.0
python-wink==1.7.1

# homeassistant.components.sensor.swiss_public_transport
python_opendata_transport==0.0.3
Expand Down Expand Up @@ -1063,7 +1063,7 @@ tellcore-net==0.3
tellcore-py==1.1.2

# homeassistant.components.tellduslive
tellduslive==0.10.3
tellduslive==0.10.4

# homeassistant.components.sensor.temper
temperusb==1.5.3
Expand Down

0 comments on commit fa324dc

Please sign in to comment.