From 8c0b50b5dfd11000edcf0f90fcc70d5641fc65d3 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Wed, 5 Dec 2018 07:03:27 -0500
Subject: [PATCH] Bump waterfurnace to 1.0

This bumps to the new version of the waterfurnace API. In the new
version the unit id is no longer manually set by the user, instead it
is retrieved from the service after login. This is less error prone as
it turns out discovering the correct unit id is hard from an end user
perspective.

Breaking change on the config, as the unit parameter is removed from
config. However I believe the number of users is very low (possibly
only 2), so adaptation should be easy.
---
 homeassistant/components/waterfurnace.py | 11 ++++-------
 requirements_all.txt                     |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/waterfurnace.py b/homeassistant/components/waterfurnace.py
index e9024131af8..0947afea141 100644
--- a/homeassistant/components/waterfurnace.py
+++ b/homeassistant/components/waterfurnace.py
@@ -19,13 +19,12 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import discovery
 
 
-REQUIREMENTS = ["waterfurnace==0.7.0"]
+REQUIREMENTS = ["waterfurnace==1.0.0"]
 
 _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "waterfurnace"
 UPDATE_TOPIC = DOMAIN + "_update"
-CONF_UNIT = "unit"
 SCAN_INTERVAL = timedelta(seconds=10)
 ERROR_INTERVAL = timedelta(seconds=300)
 MAX_FAILS = 10
@@ -36,8 +35,7 @@ NOTIFICATION_TITLE = 'WaterFurnace website status'
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Required(CONF_PASSWORD): cv.string,
-        vol.Required(CONF_USERNAME): cv.string,
-        vol.Required(CONF_UNIT): cv.string,
+        vol.Required(CONF_USERNAME): cv.string
     }),
 }, extra=vol.ALLOW_EXTRA)
 
@@ -49,9 +47,8 @@ def setup(hass, base_config):
 
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
-    unit = config.get(CONF_UNIT)
 
-    wfconn = wf.WaterFurnace(username, password, unit)
+    wfconn = wf.WaterFurnace(username, password)
     # NOTE(sdague): login will throw an exception if this doesn't
     # work, which will abort the setup.
     try:
@@ -83,7 +80,7 @@ class WaterFurnaceData(threading.Thread):
         super().__init__()
         self.hass = hass
         self.client = client
-        self.unit = client.unit
+        self.unit = self.client.gwid
         self.data = None
         self._shutdown = False
         self._fails = 0
diff --git a/requirements_all.txt b/requirements_all.txt
index 56f1dbcb709..ad5f2d9245d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1617,7 +1617,7 @@ warrant==0.6.1
 watchdog==0.8.3
 
 # homeassistant.components.waterfurnace
-waterfurnace==0.7.0
+waterfurnace==1.0.0
 
 # homeassistant.components.media_player.gpmdp
 websocket-client==0.37.0