Merge pull request #28399 from home-assistant/rc

0.101.1

homeassistant/components/airly/__init__.py

@@ -1,15 +1,16 @@
 """The Airly component."""
 import asyncio
-import logging
 from datetime import timedelta
+import logging
 
-import async_timeout
 from aiohttp.client_exceptions import ClientConnectorError
 from airly import Airly
 from airly.exceptions import AirlyError
+import async_timeout
 
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import Config, HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util import Throttle
 
@@ -45,6 +46,9 @@ async def async_setup_entry(hass, config_entry):
 
     await airly.async_update()
 
+    if not airly.data:
+        raise ConfigEntryNotReady()
+
     hass.data[DOMAIN] = {}
     hass.data[DOMAIN][DATA_CLIENT] = {}
     hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = airly
@@ -81,7 +85,7 @@ class AirlyData:
         """Update Airly data."""
 
         try:
-            with async_timeout.timeout(10):
+            with async_timeout.timeout(20):
                 measurements = self.airly.create_measurements_session_point(
                     self.latitude, self.longitude
                 )
@@ -104,11 +108,8 @@ class AirlyData:
             self.data[ATTR_API_CAQI_DESCRIPTION] = index["description"]
             self.data[ATTR_API_ADVICE] = index["advice"]
             _LOGGER.debug("Data retrieved from Airly")
-        except (
+        except asyncio.TimeoutError:
-            ValueError,
+            _LOGGER.error("Asyncio Timeout Error")
-            AirlyError,
+        except (ValueError, AirlyError, ClientConnectorError) as error:
-            asyncio.TimeoutError,
-            ClientConnectorError,
-        ) as error:
             _LOGGER.error(error)
             self.data = {}

homeassistant/components/environment_canada/manifest.json

@@ -2,11 +2,7 @@
   "domain": "environment_canada",
   "name": "Environment Canada",
   "documentation": "https://www.home-assistant.io/integrations/environment_canada",
-  "requirements": [
+  "requirements": ["env_canada==0.0.29"],
-    "env_canada==0.0.27"
-  ],
   "dependencies": [],
-  "codeowners": [
+  "codeowners": ["@michaeldavie"]
-    "@michaeldavie"
-  ]
 }

homeassistant/components/jewish_calendar/manifest.json

@@ -3,7 +3,7 @@
   "name": "Jewish calendar",
   "documentation": "https://www.home-assistant.io/integrations/jewish_calendar",
   "requirements": [
-    "hdate==0.9.1"
+    "hdate==0.9.3"
   ],
   "dependencies": [],
   "codeowners": [

homeassistant/components/myq/manifest.json

@@ -3,7 +3,7 @@
   "name": "Myq",
   "documentation": "https://www.home-assistant.io/integrations/myq",
   "requirements": [
-    "pymyq==2.0.0"
+    "pymyq==2.0.1"
   ],
   "dependencies": [],
   "codeowners": []

homeassistant/components/saj/manifest.json

@@ -3,7 +3,7 @@
   "name": "SAJ",
   "documentation": "https://www.home-assistant.io/integrations/saj",
   "requirements": [
-    "pysaj==0.0.12"
+    "pysaj==0.0.13"
   ],
   "dependencies": [],
   "codeowners": [

homeassistant/components/songpal/manifest.json

@@ -3,7 +3,7 @@
   "name": "Songpal",
   "documentation": "https://www.home-assistant.io/integrations/songpal",
   "requirements": [
-    "python-songpal==0.11.1"
+    "python-songpal==0.11.2"
   ],
   "dependencies": [],
   "codeowners": [

homeassistant/const.py

@@ -1,7 +1,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 101
-PATCH_VERSION = "0"
+PATCH_VERSION = "1"
 __short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = "{}.{}".format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 6, 1)

homeassistant/requirements.py

@@ -35,13 +35,21 @@ async def async_get_integration_with_requirements(
     This can raise IntegrationNotFound if manifest or integration
     is invalid, RequirementNotFound if there was some type of
     failure to install requirements.
+
+    Does not handle circular dependencies.
     """
     integration = await async_get_integration(hass, domain)
 
-    if hass.config.skip_pip or not integration.requirements:
+    if hass.config.skip_pip:
         return integration
 
-    await async_process_requirements(hass, integration.domain, integration.requirements)
+    if integration.requirements:
+        await async_process_requirements(
+            hass, integration.domain, integration.requirements
+        )
+
+    for dependency in integration.dependencies:
+        await async_get_integration_with_requirements(hass, dependency)
 
     return integration
 

homeassistant/setup.py

@@ -132,6 +132,17 @@ async def _async_setup_component(
         log_error(str(err))
         return False
 
+    # Some integrations fail on import because they call functions incorrectly.
+    # So we do it before validating config to catch these errors.
+    try:
+        component = integration.get_component()
+    except ImportError:
+        log_error("Unable to import component", False)
+        return False
+    except Exception:  # pylint: disable=broad-except
+        _LOGGER.exception("Setup failed for %s: unknown error", domain)
+        return False
+
     processed_config = await conf_util.async_process_component_config(
         hass, config, integration
     )
@@ -143,12 +154,6 @@ async def _async_setup_component(
     start = timer()
     _LOGGER.info("Setting up %s", domain)
 
-    try:
-        component = integration.get_component()
-    except ImportError:
-        log_error("Unable to import component", False)
-        return False
-
     if hasattr(component, "PLATFORM_SCHEMA"):
         # Entity components have their own warning
         warn_task = None

requirements_all.txt

@@ -456,7 +456,7 @@ enocean==0.50
 enturclient==0.2.0
 
 # homeassistant.components.environment_canada
-env_canada==0.0.27
+env_canada==0.0.29
 
 # homeassistant.components.envirophat
 # envirophat==0.0.6
@@ -622,7 +622,7 @@ hass-nabucasa==0.22
 hbmqtt==0.9.5
 
 # homeassistant.components.jewish_calendar
-hdate==0.9.1
+hdate==0.9.3
 
 # homeassistant.components.heatmiser
 heatmiserV3==0.9.1
@@ -1328,7 +1328,7 @@ pymsteams==0.1.12
 pymusiccast==0.1.6
 
 # homeassistant.components.myq
-pymyq==2.0.0
+pymyq==2.0.1
 
 # homeassistant.components.mysensors
 pymysensors==0.18.0
@@ -1423,7 +1423,7 @@ pyrepetier==3.0.5
 pysabnzbd==1.1.0
 
 # homeassistant.components.saj
-pysaj==0.0.12
+pysaj==0.0.13
 
 # homeassistant.components.sony_projector
 pysdcp==1
@@ -1564,7 +1564,7 @@ python-ripple-api==0.0.3
 python-sochain-api==0.0.2
 
 # homeassistant.components.songpal
-python-songpal==0.11.1
+python-songpal==0.11.2
 
 # homeassistant.components.synologydsm
 python-synology==0.2.0

requirements_test_all.txt

@@ -230,7 +230,7 @@ hass-nabucasa==0.22
 hbmqtt==0.9.5
 
 # homeassistant.components.jewish_calendar
-hdate==0.9.1
+hdate==0.9.3
 
 # homeassistant.components.here_travel_time
 herepy==0.6.3.1

tests/test_requirements.py

@@ -112,7 +112,17 @@ async def test_install_missing_package(hass):
 async def test_get_integration_with_requirements(hass):
     """Check getting an integration with loaded requirements."""
     hass.config.skip_pip = False
-    mock_integration(hass, MockModule("test_component", requirements=["hello==1.0.0"]))
+    mock_integration(
+        hass, MockModule("test_component_dep", requirements=["test-comp-dep==1.0.0"])
+    )
+    mock_integration(
+        hass,
+        MockModule(
+            "test_component",
+            requirements=["test-comp==1.0.0"],
+            dependencies=["test_component_dep"],
+        ),
+    )
 
     with patch(
         "homeassistant.util.package.is_installed", return_value=False
@@ -126,8 +136,13 @@ async def test_get_integration_with_requirements(hass):
         assert integration
         assert integration.domain == "test_component"
 
-    assert len(mock_is_installed.mock_calls) == 1
+    assert len(mock_is_installed.mock_calls) == 2
-    assert len(mock_inst.mock_calls) == 1
+    assert mock_is_installed.mock_calls[0][1][0] == "test-comp==1.0.0"
+    assert mock_is_installed.mock_calls[1][1][0] == "test-comp-dep==1.0.0"
+
+    assert len(mock_inst.mock_calls) == 2
+    assert mock_inst.mock_calls[0][1][0] == "test-comp==1.0.0"
+    assert mock_inst.mock_calls[1][1][0] == "test-comp-dep==1.0.0"
 
 
 async def test_install_with_wheels_index(hass):

tests/test_setup.py

@@ -527,3 +527,11 @@ async def test_when_setup_already_loaded(hass):
     setup.async_when_setup(hass, "test", mock_callback)
     await hass.async_block_till_done()
     assert calls == ["test", "test"]
+
+
+async def test_setup_import_blows_up(hass):
+    """Test that we handle it correctly when importing integration blows up."""
+    with mock.patch(
+        "homeassistant.loader.Integration.get_component", side_effect=ValueError
+    ):
+        assert not await setup.async_setup_component(hass, "sun", {})