From 0a53b863cd7ef38cbf315f90d2cd21ac2412eb3e Mon Sep 17 00:00:00 2001 From: rhooper Date: Fri, 1 Jul 2016 21:47:55 -0400 Subject: [PATCH 1/4] bump pyvera version to 0.2.13 (#2406) --- homeassistant/components/vera.py | 2 +- requirements_all.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/vera.py b/homeassistant/components/vera.py index 455927ca999..ce7bf1556fa 100644 --- a/homeassistant/components/vera.py +++ b/homeassistant/components/vera.py @@ -13,7 +13,7 @@ from homeassistant.helpers import discovery from homeassistant.const import EVENT_HOMEASSISTANT_STOP from homeassistant.helpers.entity import Entity -REQUIREMENTS = ['pyvera==0.2.12'] +REQUIREMENTS = ['pyvera==0.2.13'] _LOGGER = logging.getLogger(__name__) diff --git a/requirements_all.txt b/requirements_all.txt index 2dc4da44710..d73c13580e8 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -339,7 +339,7 @@ python-wink==0.7.8 pyuserinput==0.1.9 # homeassistant.components.vera -pyvera==0.2.12 +pyvera==0.2.13 # homeassistant.components.wemo pywemo==0.4.3 From 8d9f4a17543ab2bab34590ddd3aa4b3f81f5295d Mon Sep 17 00:00:00 2001 From: AlucardZero Date: Sat, 2 Jul 2016 13:03:49 -0400 Subject: [PATCH 2/4] check for OP_NO_COMPRESSION support before trying to use it (#2423) --- homeassistant/components/http.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/http.py b/homeassistant/components/http.py index 11aa18cad5c..71879082862 100644 --- a/homeassistant/components/http.py +++ b/homeassistant/components/http.py @@ -41,7 +41,9 @@ DATA_API_PASSWORD = 'api_password' # specified here: https://wiki.mozilla.org/Security/Server_Side_TLS # Intermediate guidelines are followed. SSL_VERSION = ssl.PROTOCOL_SSLv23 -SSL_OPTS = ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 | ssl.OP_NO_COMPRESSION +SSL_OPTS = ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 +if hasattr(ssl, 'OP_NO_COMPRESSION'): + SSL_OPTS |= ssl.OP_NO_COMPRESSION CIPHERS = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:" \ "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:" \ "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:" \ From 8e406a70f6e4933de921fbe7db6e31c71a678fb1 Mon Sep 17 00:00:00 2001 From: William Scanlon Date: Sat, 2 Jul 2016 13:04:51 -0400 Subject: [PATCH 3/4] Downgraded pubnub version (#2420) --- homeassistant/components/binary_sensor/wink.py | 2 +- homeassistant/components/garage_door/wink.py | 2 +- homeassistant/components/light/wink.py | 2 +- homeassistant/components/lock/wink.py | 2 +- homeassistant/components/rollershutter/wink.py | 2 +- homeassistant/components/sensor/wink.py | 2 +- homeassistant/components/switch/wink.py | 2 +- homeassistant/components/wink.py | 2 +- requirements_all.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/binary_sensor/wink.py b/homeassistant/components/binary_sensor/wink.py index 9ec85e63503..17f4544a5ea 100644 --- a/homeassistant/components/binary_sensor/wink.py +++ b/homeassistant/components/binary_sensor/wink.py @@ -12,7 +12,7 @@ from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.helpers.entity import Entity from homeassistant.loader import get_component -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] # These are the available sensors mapped to binary_sensor class SENSOR_TYPES = { diff --git a/homeassistant/components/garage_door/wink.py b/homeassistant/components/garage_door/wink.py index 73692290f50..a99f35ecf5b 100644 --- a/homeassistant/components/garage_door/wink.py +++ b/homeassistant/components/garage_door/wink.py @@ -10,7 +10,7 @@ from homeassistant.components.garage_door import GarageDoorDevice from homeassistant.components.wink import WinkDevice from homeassistant.const import CONF_ACCESS_TOKEN -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] def setup_platform(hass, config, add_devices, discovery_info=None): diff --git a/homeassistant/components/light/wink.py b/homeassistant/components/light/wink.py index 5fdec96f5d4..00e059fdc3e 100644 --- a/homeassistant/components/light/wink.py +++ b/homeassistant/components/light/wink.py @@ -14,7 +14,7 @@ from homeassistant.util import color as color_util from homeassistant.util.color import \ color_temperature_mired_to_kelvin as mired_to_kelvin -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] def setup_platform(hass, config, add_devices_callback, discovery_info=None): diff --git a/homeassistant/components/lock/wink.py b/homeassistant/components/lock/wink.py index 7551302499a..c3232e67e03 100644 --- a/homeassistant/components/lock/wink.py +++ b/homeassistant/components/lock/wink.py @@ -10,7 +10,7 @@ from homeassistant.components.lock import LockDevice from homeassistant.components.wink import WinkDevice from homeassistant.const import CONF_ACCESS_TOKEN -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] def setup_platform(hass, config, add_devices, discovery_info=None): diff --git a/homeassistant/components/rollershutter/wink.py b/homeassistant/components/rollershutter/wink.py index 8a31148da01..750e7cf654b 100644 --- a/homeassistant/components/rollershutter/wink.py +++ b/homeassistant/components/rollershutter/wink.py @@ -10,7 +10,7 @@ from homeassistant.components.rollershutter import RollershutterDevice from homeassistant.components.wink import WinkDevice from homeassistant.const import CONF_ACCESS_TOKEN -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] def setup_platform(hass, config, add_devices, discovery_info=None): diff --git a/homeassistant/components/sensor/wink.py b/homeassistant/components/sensor/wink.py index ac885152a2e..31bfba7b3bd 100644 --- a/homeassistant/components/sensor/wink.py +++ b/homeassistant/components/sensor/wink.py @@ -12,7 +12,7 @@ from homeassistant.helpers.entity import Entity from homeassistant.components.wink import WinkDevice from homeassistant.loader import get_component -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] SENSOR_TYPES = ['temperature', 'humidity'] diff --git a/homeassistant/components/switch/wink.py b/homeassistant/components/switch/wink.py index 64c19e34bc9..bb2183677ea 100644 --- a/homeassistant/components/switch/wink.py +++ b/homeassistant/components/switch/wink.py @@ -10,7 +10,7 @@ from homeassistant.components.wink import WinkDevice from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.helpers.entity import ToggleEntity -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] def setup_platform(hass, config, add_devices, discovery_info=None): diff --git a/homeassistant/components/wink.py b/homeassistant/components/wink.py index 4e9fec77ba5..de65d3d664a 100644 --- a/homeassistant/components/wink.py +++ b/homeassistant/components/wink.py @@ -12,7 +12,7 @@ from homeassistant.const import CONF_ACCESS_TOKEN, ATTR_BATTERY_LEVEL from homeassistant.helpers.entity import Entity DOMAIN = "wink" -REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8'] +REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.6'] SUBSCRIPTION_HANDLER = None CHANNELS = [] diff --git a/requirements_all.txt b/requirements_all.txt index d73c13580e8..9c17a02cd03 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -227,7 +227,7 @@ psutil==4.3.0 # homeassistant.components.rollershutter.wink # homeassistant.components.sensor.wink # homeassistant.components.switch.wink -pubnub==3.7.8 +pubnub==3.7.6 # homeassistant.components.notify.pushbullet pushbullet.py==0.10.0 From 906e64fdb5027dc31b53f681b7d949a84e0540ff Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 2 Jul 2016 10:06:24 -0700 Subject: [PATCH 4/4] Bump version to 0.23.1 --- homeassistant/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/const.py b/homeassistant/const.py index ab9fc35ee4c..5c9d9067225 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -1,7 +1,7 @@ # coding: utf-8 """Constants used by Home Assistant components.""" -__version__ = "0.23.0" +__version__ = "0.23.1" REQUIRED_PYTHON_VER = (3, 4) PLATFORM_FORMAT = '{}.{}'