Skip to content

Commit

Permalink
Bump ZHA modules versions. (home-assistant#23705)
Browse files Browse the repository at this point in the history
* Bump ZHA modules versions.

Bump bellows-homeassistant version.
Bump zigpy-homeassistant version.
Bump zigpy-xbee-homeassistant version.

* Update requirements_*.txt
  • Loading branch information
Adminiuga authored and dmulcahey committed May 5, 2019
1 parent 9c1bbd1 commit 8328ea6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 30 deletions.
5 changes: 0 additions & 5 deletions homeassistant/components/zha/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
CONF_RADIO_TYPE, CONF_USB_PATH, DATA_ZHA, DATA_ZHA_CONFIG,
DATA_ZHA_CORE_COMPONENT, DATA_ZHA_DISPATCHERS, DATA_ZHA_GATEWAY,
DEFAULT_BAUDRATE, DEFAULT_RADIO_TYPE, DOMAIN, ENABLE_QUIRKS, RadioType)
from .core.patches import apply_cluster_listener_patch
from .core.registries import establish_device_mappings

DEVICE_CONFIG_SCHEMA_ENTRY = vol.Schema({
Expand Down Expand Up @@ -91,10 +90,6 @@ async def async_setup_entry(hass, config_entry):
# pylint: disable=W0611, W0612
import zhaquirks # noqa

# patch zigpy listener to prevent flooding logs with warnings due to
# how zigpy implemented its listeners
apply_cluster_listener_patch()

zha_gateway = ZHAGateway(hass, config)
await zha_gateway.async_initialize(config_entry)

Expand Down
17 changes: 0 additions & 17 deletions homeassistant/components/zha/core/patches.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,6 @@
https://home-assistant.io/components/zha/
"""

import types


def apply_cluster_listener_patch():
"""Apply patches to ZHA objects."""
# patch zigpy listener to prevent flooding logs with warnings due to
# how zigpy implemented its listeners
from zigpy.appdb import ClusterPersistingListener

def zha_send_event(self, cluster, command, args):
pass

ClusterPersistingListener.zha_send_event = types.MethodType(
zha_send_event,
ClusterPersistingListener
)


def apply_application_controller_patch(zha_gateway):
"""Apply patches to ZHA objects."""
Expand Down
6 changes: 3 additions & 3 deletions homeassistant/components/zha/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"name": "Zigbee Home Automation",
"documentation": "https://www.home-assistant.io/components/zha",
"requirements": [
"bellows-homeassistant==0.7.2",
"bellows-homeassistant==0.7.3",
"zha-quirks==0.0.9",
"zigpy-deconz==0.1.4",
"zigpy-homeassistant==0.3.2",
"zigpy-xbee-homeassistant==0.2.0"
"zigpy-homeassistant==0.3.3",
"zigpy-xbee-homeassistant==0.2.1"
],
"dependencies": [],
"codeowners": [
Expand Down
6 changes: 3 additions & 3 deletions requirements_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ batinfo==0.4.2
beautifulsoup4==4.7.1

# homeassistant.components.zha
bellows-homeassistant==0.7.2
bellows-homeassistant==0.7.3

# homeassistant.components.bmw_connected_drive
bimmer_connected==0.5.3
Expand Down Expand Up @@ -1857,10 +1857,10 @@ ziggo-mediabox-xl==1.1.0
zigpy-deconz==0.1.4

# homeassistant.components.zha
zigpy-homeassistant==0.3.2
zigpy-homeassistant==0.3.3

# homeassistant.components.zha
zigpy-xbee-homeassistant==0.2.0
zigpy-xbee-homeassistant==0.2.1

# homeassistant.components.zoneminder
zm-py==0.3.3
4 changes: 2 additions & 2 deletions requirements_test_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ av==6.1.2
axis==22

# homeassistant.components.zha
bellows-homeassistant==0.7.2
bellows-homeassistant==0.7.3

# homeassistant.components.caldav
caldav==0.6.1
Expand Down Expand Up @@ -342,4 +342,4 @@ vultr==0.1.2
wakeonlan==1.1.6

# homeassistant.components.zha
zigpy-homeassistant==0.3.2
zigpy-homeassistant==0.3.3

0 comments on commit 8328ea6

Please sign in to comment.