From d7e52d8014c3a8a55c2eeb1d7d9d35a229dc1248 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 29 Dec 2017 10:06:52 +0100
Subject: [PATCH] Upgrade pyowm to 2.8.0 (#11332)

---
 .../components/sensor/openweathermap.py          | 12 ++++++------
 .../components/weather/openweathermap.py         | 16 +++++++++-------
 requirements_all.txt                             |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/sensor/openweathermap.py b/homeassistant/components/sensor/openweathermap.py
index 2072251c205..43c7d1ec2df 100755
--- a/homeassistant/components/sensor/openweathermap.py
+++ b/homeassistant/components/sensor/openweathermap.py
@@ -4,20 +4,20 @@ Support for the OpenWeatherMap (OWM) service.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.openweathermap/
 """
-import logging
 from datetime import timedelta
+import logging
 
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (
-    CONF_API_KEY, CONF_NAME, TEMP_CELSIUS, TEMP_FAHRENHEIT,
-    CONF_MONITORED_CONDITIONS, ATTR_ATTRIBUTION)
+    ATTR_ATTRIBUTION, CONF_API_KEY, CONF_MONITORED_CONDITIONS, CONF_NAME,
+    TEMP_CELSIUS, TEMP_FAHRENHEIT)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyowm==2.7.1']
+REQUIREMENTS = ['pyowm==2.8.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -53,12 +53,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """Set up the OpenWeatherMap sensor."""
+    from pyowm import OWM
+
     if None in (hass.config.latitude, hass.config.longitude):
         _LOGGER.error("Latitude or longitude not set in Home Assistant config")
         return False
 
-    from pyowm import OWM
-
     SENSOR_TYPES['temperature'][1] = hass.config.units.temperature_unit
 
     name = config.get(CONF_NAME)
diff --git a/homeassistant/components/weather/openweathermap.py b/homeassistant/components/weather/openweathermap.py
index a50e160cddb..1ff5eeaa535 100644
--- a/homeassistant/components/weather/openweathermap.py
+++ b/homeassistant/components/weather/openweathermap.py
@@ -4,27 +4,29 @@ Support for the OpenWeatherMap (OWM) service.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/weather.openweathermap/
 """
-import logging
 from datetime import timedelta
+import logging
 
 import voluptuous as vol
 
 from homeassistant.components.weather import (
-    WeatherEntity, PLATFORM_SCHEMA, ATTR_FORECAST_TEMP, ATTR_FORECAST_TIME)
-from homeassistant.const import (CONF_API_KEY, CONF_NAME, CONF_LATITUDE,
-                                 CONF_LONGITUDE, STATE_UNKNOWN, TEMP_CELSIUS)
+    ATTR_FORECAST_TEMP, ATTR_FORECAST_TIME, PLATFORM_SCHEMA, WeatherEntity)
+from homeassistant.const import (
+    CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, STATE_UNKNOWN,
+    TEMP_CELSIUS)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyowm==2.7.1']
+REQUIREMENTS = ['pyowm==2.8.0']
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_NAME = 'OpenWeatherMap'
 ATTRIBUTION = 'Data provided by OpenWeatherMap'
 
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10)
+DEFAULT_NAME = 'OpenWeatherMap'
+
 MIN_TIME_BETWEEN_FORECAST_UPDATES = timedelta(minutes=30)
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10)
 
 CONDITION_CLASSES = {
     'cloudy': [804],
diff --git a/requirements_all.txt b/requirements_all.txt
index ccfc6e79118..7e112202424 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -797,7 +797,7 @@ pyotp==2.2.6
 
 # homeassistant.components.sensor.openweathermap
 # homeassistant.components.weather.openweathermap
-pyowm==2.7.1
+pyowm==2.8.0
 
 # homeassistant.components.qwikswitch
 pyqwikswitch==0.4