Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15856 from home-assistant/rc 

0.75.2
pull/15876/head 0.75.2
Paulus Schoutsen 2018-08-06 12:59:54 +02:00 committed by GitHub
parent 3f8c91d77c 2f15a40e97
commit 527585ff9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/envisalink.py
View File

@ -16,7 +16,7 @@ from homeassistant.helpers.entity import Entity
from homeassistant.helpers.discovery import async_load_platform from homeassistant.helpers.discovery import async_load_platform
from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.dispatcher import async_dispatcher_send
REQUIREMENTS = ['pyenvisalink==2.2'] REQUIREMENTS = ['pyenvisalink==2.3']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -111,20 +111,24 @@ def async_setup(hass, config):
def login_fail_callback(data): def login_fail_callback(data):
"""Handle when the evl rejects our login.""" """Handle when the evl rejects our login."""
_LOGGER.error("The Envisalink rejected your credentials") _LOGGER.error("The Envisalink rejected your credentials")
sync_connect.set_result(False) if not sync_connect.done():
sync_connect.set_result(False)
@callback @callback
def connection_fail_callback(data): def connection_fail_callback(data):
"""Network failure callback.""" """Network failure callback."""
_LOGGER.error("Could not establish a connection with the Envisalink") _LOGGER.error("Could not establish a connection with the Envisalink")
sync_connect.set_result(False) if not sync_connect.done():
sync_connect.set_result(False)
@callback @callback
def connection_success_callback(data): def connection_success_callback(data):
"""Handle a successful connection.""" """Handle a successful connection."""
_LOGGER.info("Established a connection with the Envisalink") _LOGGER.info("Established a connection with the Envisalink")
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, stop_envisalink) if not sync_connect.done():
sync_connect.set_result(True) hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
stop_envisalink)
sync_connect.set_result(True)
@callback @callback
def zones_updated_callback(data): def zones_updated_callback(data):

2
homeassistant/const.py
View File

@ -2,7 +2,7 @@
"""Constants used by Home Assistant components.""" """Constants used by Home Assistant components."""
MAJOR_VERSION = 0 MAJOR_VERSION = 0
MINOR_VERSION = 75 MINOR_VERSION = 75
PATCH_VERSION = '1' PATCH_VERSION = '2'
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 5, 3) REQUIRED_PYTHON_VER = (3, 5, 3)

2
homeassistant/package_constraints.txt
View File

@ -8,7 +8,7 @@ pip>=8.0.3
pytz>=2018.04 pytz>=2018.04
pyyaml>=3.13,<4 pyyaml>=3.13,<4
requests==2.19.1 requests==2.19.1
voluptuous==0.11.3 voluptuous==0.11.5
# Breaks Python 3.6 and is not needed for our supported Python versions # Breaks Python 3.6 and is not needed for our supported Python versions
enum34==1000000000.0.0 enum34==1000000000.0.0

6
requirements_all.txt
View File

@ -9,7 +9,7 @@ pip>=8.0.3
pytz>=2018.04 pytz>=2018.04
pyyaml>=3.13,<4 pyyaml>=3.13,<4
requests==2.19.1 requests==2.19.1
voluptuous==0.11.3 voluptuous==0.11.5
# homeassistant.components.nuimo_controller # homeassistant.components.nuimo_controller
--only-binary=all nuimo==0.1.0 --only-binary=all nuimo==0.1.0
@ -421,7 +421,7 @@ hole==0.3.0
holidays==0.9.5 holidays==0.9.5
# homeassistant.components.frontend # homeassistant.components.frontend
home-assistant-frontend==20180803.0 home-assistant-frontend==20180804.0
# homeassistant.components.homekit_controller # homeassistant.components.homekit_controller
# homekit==0.10 # homekit==0.10
@ -817,7 +817,7 @@ pyeight==0.0.9
pyemby==1.5 pyemby==1.5
# homeassistant.components.envisalink # homeassistant.components.envisalink
pyenvisalink==2.2 pyenvisalink==2.3
# homeassistant.components.climate.ephember # homeassistant.components.climate.ephember
pyephember==0.1.1 pyephember==0.1.1

2
requirements_test_all.txt
View File

@ -81,7 +81,7 @@ hbmqtt==0.9.2
holidays==0.9.5 holidays==0.9.5
# homeassistant.components.frontend # homeassistant.components.frontend
home-assistant-frontend==20180803.0 home-assistant-frontend==20180804.0
# homeassistant.components.homematicip_cloud # homeassistant.components.homematicip_cloud
homematicip==0.9.8 homematicip==0.9.8

2
setup.py
View File

@ -42,7 +42,7 @@ REQUIRES = [
'pytz>=2018.04', 'pytz>=2018.04',
'pyyaml>=3.13,<4', 'pyyaml>=3.13,<4',
'requests==2.19.1', 'requests==2.19.1',
'voluptuous==0.11.3', 'voluptuous==0.11.5',
] ]
MIN_PY_VERSION = '.'.join(map(str, hass_const.REQUIRED_PYTHON_VER)) MIN_PY_VERSION = '.'.join(map(str, hass_const.REQUIRED_PYTHON_VER))