Bump upb-lib to 0.6.0 (#137339)

homeassistant/components/upb/__init__.py

@@ -27,6 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     file = config_entry.data[CONF_FILE_PATH]
 
     upb = upb_lib.UpbPim({"url": url, "UPStartExportFile": file})
+    await upb.load_upstart_file()
     await upb.async_connect()
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][config_entry.entry_id] = {"upb": upb}

homeassistant/components/upb/config_flow.py

@@ -40,8 +40,9 @@ async def _validate_input(data):
     url = _make_url_from_data(data)
 
     upb = upb_lib.UpbPim({"url": url, "UPStartExportFile": file_path})
-
-    await upb.async_connect(_connected_callback)
+    upb.add_handler("connected", _connected_callback)
+    await upb.load_upstart_file()
+    await upb.async_connect()
 
     if not upb.config_ok:
         _LOGGER.error("Missing or invalid UPB file: %s", file_path)

homeassistant/components/upb/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/upb",
   "iot_class": "local_push",
   "loggers": ["upb_lib"],
-  "requirements": ["upb-lib==0.5.9"]
+  "requirements": ["upb-lib==0.6.0"]
 }

requirements_all.txt

@@ -2959,7 +2959,7 @@ unifiled==0.11
 universal-silabs-flasher==0.0.25
 
 # homeassistant.components.upb
-upb-lib==0.5.9
+upb-lib==0.6.0
 
 # homeassistant.components.upcloud
 upcloud-api==2.6.0

requirements_test_all.txt

@@ -2375,7 +2375,7 @@ ultraheat-api==0.5.7
 unifi-discovery==1.2.0
 
 # homeassistant.components.upb
-upb-lib==0.5.9
+upb-lib==0.6.0
 
 # homeassistant.components.upcloud
 upcloud-api==2.6.0

tests/components/upb/test_config_flow.py

@@ -13,15 +13,20 @@ from homeassistant.data_entry_flow import FlowResultType
 def mocked_upb(sync_complete=True, config_ok=True):
     """Mock UPB lib."""
 
-    def _upb_lib_connect(callback):
+    def _add_handler(_, callback):
         callback()
 
+    def _dummy_add_handler(_, _callback):
+        pass
+
     upb_mock = AsyncMock()
     type(upb_mock).network_id = PropertyMock(return_value="42")
     type(upb_mock).config_ok = PropertyMock(return_value=config_ok)
     type(upb_mock).disconnect = MagicMock()
-    if sync_complete:
-        upb_mock.async_connect.side_effect = _upb_lib_connect
+    type(upb_mock).add_handler = MagicMock()
+    upb_mock.add_handler.side_effect = (
+        _add_handler if sync_complete else _dummy_add_handler
+    )
     return patch(
         "homeassistant.components.upb.config_flow.upb_lib.UpbPim", return_value=upb_mock
     )