From 2c2f9ef915fa634f83a637edfbfbe8e554788655 Mon Sep 17 00:00:00 2001 From: Kareem ElFaramawi Date: Wed, 25 Sep 2024 09:05:03 -0400 Subject: [PATCH 1/3] bump jaraco.abode to 6.2.1 --- homeassistant/components/abode/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/abode/manifest.json b/homeassistant/components/abode/manifest.json index be705238932dbd..9f5806d544a5bf 100644 --- a/homeassistant/components/abode/manifest.json +++ b/homeassistant/components/abode/manifest.json @@ -9,5 +9,5 @@ }, "iot_class": "cloud_push", "loggers": ["jaraco.abode", "lomond"], - "requirements": ["jaraco.abode==6.2.0"] + "requirements": ["jaraco.abode==6.2.1"] } diff --git a/requirements_all.txt b/requirements_all.txt index 8f46fb0203d44b..0de06462f645d2 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1212,7 +1212,7 @@ ismartgate==5.0.1 israel-rail-api==0.1.2 # homeassistant.components.abode -jaraco.abode==6.2.0 +jaraco.abode==6.2.1 # homeassistant.components.jellyfin jellyfin-apiclient-python==1.9.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 0e7dd29c64c5b6..3aee6a1d43e51b 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1020,7 +1020,7 @@ ismartgate==5.0.1 israel-rail-api==0.1.2 # homeassistant.components.abode -jaraco.abode==6.2.0 +jaraco.abode==6.2.1 # homeassistant.components.jellyfin jellyfin-apiclient-python==1.9.2 From 1d45569039d8b47d9b0c0fd247ecfd3c53a2900e Mon Sep 17 00:00:00 2001 From: Kareem ElFaramawi Date: Wed, 25 Sep 2024 09:07:19 -0400 Subject: [PATCH 2/3] update abode user_data path to HA config --- homeassistant/components/abode/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/homeassistant/components/abode/__init__.py b/homeassistant/components/abode/__init__.py index a27eda2cf126db..1cbb7aaf15c6f6 100644 --- a/homeassistant/components/abode/__init__.py +++ b/homeassistant/components/abode/__init__.py @@ -4,8 +4,10 @@ from dataclasses import dataclass, field from functools import partial +from pathlib import Path from jaraco.abode.client import Client as Abode +import jaraco.abode.config from jaraco.abode.exceptions import ( AuthenticationException as AbodeAuthenticationException, Exception as AbodeException, @@ -100,6 +102,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ) try: + jaraco.abode.config.paths.override(user_data=Path(hass.config.path("Abode"))) abode = await hass.async_add_executor_job( Abode, username, password, True, True, True ) From ecf9aaa6072bce2536893cf9361bc35dad69bae6 Mon Sep 17 00:00:00 2001 From: Kareem ElFaramawi Date: Thu, 26 Sep 2024 12:37:09 -0400 Subject: [PATCH 3/3] Move abode config call out of try block --- homeassistant/components/abode/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/abode/__init__.py b/homeassistant/components/abode/__init__.py index 1cbb7aaf15c6f6..0542e362268ebb 100644 --- a/homeassistant/components/abode/__init__.py +++ b/homeassistant/components/abode/__init__.py @@ -95,6 +95,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: password = entry.data[CONF_PASSWORD] polling = entry.data[CONF_POLLING] + # Configure abode library to use config directory for storing data + jaraco.abode.config.paths.override(user_data=Path(hass.config.path("Abode"))) + # For previous config entries where unique_id is None if entry.unique_id is None: hass.config_entries.async_update_entry( @@ -102,7 +105,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ) try: - jaraco.abode.config.paths.override(user_data=Path(hass.config.path("Abode"))) abode = await hass.async_add_executor_job( Abode, username, password, True, True, True )