From 2c1e354537e0655cb7077e6d8d61a96c5ba48ee3 Mon Sep 17 00:00:00 2001
From: David Bonnes <zxdavb@bonnes.me>
Date: Wed, 8 Jan 2020 18:57:28 +0000
Subject: [PATCH] evohome: allow two round thermostats per gateway (#30589)

* bugfix issue #30517
* bump library, tweak name in manifest
* remove lint hint
---
 homeassistant/components/adguard/manifest.json | 2 +-
 homeassistant/components/evohome/climate.py    | 8 +++-----
 homeassistant/components/evohome/manifest.json | 4 ++--
 requirements_all.txt                           | 4 ++--
 requirements_test_all.txt                      | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/adguard/manifest.json b/homeassistant/components/adguard/manifest.json
index c77e0b3254d..bdfec1f254b 100644
--- a/homeassistant/components/adguard/manifest.json
+++ b/homeassistant/components/adguard/manifest.json
@@ -3,7 +3,7 @@
   "name": "AdGuard Home",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/adguard",
-  "requirements": ["adguardhome==0.4.1"],
+  "requirements": ["adguardhome==0.4.0"],
   "dependencies": [],
   "codeowners": ["@frenck"]
 }
diff --git a/homeassistant/components/evohome/climate.py b/homeassistant/components/evohome/climate.py
index 82a7001539d..3da11bc8087 100644
--- a/homeassistant/components/evohome/climate.py
+++ b/homeassistant/components/evohome/climate.py
@@ -81,8 +81,8 @@ async def async_setup_platform(
         broker.params[CONF_LOCATION_IDX],
     )
 
-    # special case of RoundModulation/RoundWireless (is a single zone system)
-    if broker.config["zones"][0]["zoneType"] == "Thermostat":
+    # special case of RoundModulation/RoundWireless as a single zone system
+    if len(broker.tcs.zones) == 1 and list(broker.tcs.zones.keys())[0] == "Thermostat":
         zone = list(broker.tcs.zones.values())[0]
         _LOGGER.debug(
             "Found the Thermostat (%s), id=%s, name=%s",
@@ -121,9 +121,7 @@ class EvoClimateDevice(EvoDevice, ClimateDevice):
 
     async def _set_tcs_mode(self, op_mode: str) -> None:
         """Set a Controller to any of its native EVO_* operating modes."""
-        await self._call_client_api(
-            self._evo_tcs._set_status(op_mode)  # pylint: disable=protected-access
-        )
+        await self._call_client_api(self._evo_tcs.set_status(op_mode))
 
     @property
     def hvac_modes(self) -> List[str]:
diff --git a/homeassistant/components/evohome/manifest.json b/homeassistant/components/evohome/manifest.json
index 579f14757f8..16b27452c7c 100644
--- a/homeassistant/components/evohome/manifest.json
+++ b/homeassistant/components/evohome/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "evohome",
-  "name": "Honeywell evohome / Total Connect Comfort",
+  "name": "Honeywell Total Connect Comfort (Europe)",
   "documentation": "https://www.home-assistant.io/integrations/evohome",
-  "requirements": ["evohome-async==0.3.4b1"],
+  "requirements": ["evohome-async==0.3.5.post1"],
   "dependencies": [],
   "codeowners": ["@zxdavb"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 1ffc19a64d4..53240bed636 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -117,7 +117,7 @@ adafruit-circuitpython-mcp230xx==1.1.2
 adb-shell==0.1.1
 
 # homeassistant.components.adguard
-adguardhome==0.4.1
+adguardhome==0.4.0
 
 # homeassistant.components.frontier_silicon
 afsapi==0.0.4
@@ -510,7 +510,7 @@ eternalegypt==0.0.11
 # evdev==1.1.2
 
 # homeassistant.components.evohome
-evohome-async==0.3.4b1
+evohome-async==0.3.5.post1
 
 # homeassistant.components.dlib_face_detect
 # homeassistant.components.dlib_face_identify
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index d3d2af0f40b..dc4a7da861c 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -32,7 +32,7 @@ abodepy==0.16.7
 adb-shell==0.1.1
 
 # homeassistant.components.adguard
-adguardhome==0.4.1
+adguardhome==0.4.0
 
 # homeassistant.components.geonetnz_quakes
 aio_geojson_geonetnz_quakes==0.11