From e2766eca9bd4840818bf9351d425e49d17fb03f7 Mon Sep 17 00:00:00 2001 From: Martins Sipenko Date: Sun, 18 Aug 2024 11:59:36 +0300 Subject: [PATCH 1/5] Reenable Smarty integration --- homeassistant/components/smarty/__init__.py | 2 +- homeassistant/components/smarty/binary_sensor.py | 2 +- homeassistant/components/smarty/fan.py | 2 +- homeassistant/components/smarty/manifest.json | 6 +++--- homeassistant/components/smarty/sensor.py | 2 +- requirements_all.txt | 3 +++ 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/smarty/__init__.py b/homeassistant/components/smarty/__init__.py index cc2e3850ef9c37..17c4bd0a26a850 100644 --- a/homeassistant/components/smarty/__init__.py +++ b/homeassistant/components/smarty/__init__.py @@ -4,7 +4,7 @@ import ipaddress import logging -from pysmarty import Smarty +from pysmarty2 import Smarty import voluptuous as vol from homeassistant.const import CONF_HOST, CONF_NAME, Platform diff --git a/homeassistant/components/smarty/binary_sensor.py b/homeassistant/components/smarty/binary_sensor.py index cf40dc7b9825ab..b31c51244b8b08 100644 --- a/homeassistant/components/smarty/binary_sensor.py +++ b/homeassistant/components/smarty/binary_sensor.py @@ -4,7 +4,7 @@ import logging -from pysmarty import Smarty +from pysmarty2 import Smarty from homeassistant.components.binary_sensor import ( BinarySensorDeviceClass, diff --git a/homeassistant/components/smarty/fan.py b/homeassistant/components/smarty/fan.py index 37f7c2e493f09e..a2d72250197b1a 100644 --- a/homeassistant/components/smarty/fan.py +++ b/homeassistant/components/smarty/fan.py @@ -6,7 +6,7 @@ import math from typing import Any -from pysmarty import Smarty +from pysmarty2 import Smarty from homeassistant.components.fan import FanEntity, FanEntityFeature from homeassistant.core import HomeAssistant, callback diff --git a/homeassistant/components/smarty/manifest.json b/homeassistant/components/smarty/manifest.json index 8769aa666a785d..e8698e27789870 100644 --- a/homeassistant/components/smarty/manifest.json +++ b/homeassistant/components/smarty/manifest.json @@ -2,9 +2,9 @@ "domain": "smarty", "name": "Salda Smarty", "codeowners": ["@z0mbieprocess"], - "disabled": "Dependencies not compatible with the new pip resolver", "documentation": "https://www.home-assistant.io/integrations/smarty", + "integration_type": "hub", "iot_class": "local_polling", - "loggers": ["pymodbus", "pysmarty"], - "requirements": ["pysmarty==0.8"] + "loggers": ["pymodbus", "pysmarty2"], + "requirements": ["pysmarty2==0.10"] } diff --git a/homeassistant/components/smarty/sensor.py b/homeassistant/components/smarty/sensor.py index a0c15b3825f3cd..3c6873611b4add 100644 --- a/homeassistant/components/smarty/sensor.py +++ b/homeassistant/components/smarty/sensor.py @@ -5,7 +5,7 @@ import datetime as dt import logging -from pysmarty import Smarty +from pysmarty2 import Smarty from homeassistant.components.sensor import SensorDeviceClass, SensorEntity from homeassistant.const import UnitOfTemperature diff --git a/requirements_all.txt b/requirements_all.txt index af14e1b5c3643f..1b250bbfcdb5bc 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2204,6 +2204,9 @@ pysmartapp==0.3.5 # homeassistant.components.smartthings pysmartthings==0.7.8 +# homeassistant.components.smarty +pysmarty2==0.10 + # homeassistant.components.edl21 pysml==0.0.12 From 639fef32b90d22117938f864e6ea3c55b0fc5074 Mon Sep 17 00:00:00 2001 From: Martins Sipenko Date: Sun, 18 Aug 2024 12:06:27 +0300 Subject: [PATCH 2/5] Updated codeowners to myself --- CODEOWNERS | 2 +- homeassistant/components/smarty/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 6593c02c8a514e..8cb992ade19692 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1324,7 +1324,7 @@ build.json @home-assistant/supervisor /tests/components/smart_meter_texas/ @grahamwetzler /homeassistant/components/smarttub/ @mdz /tests/components/smarttub/ @mdz -/homeassistant/components/smarty/ @z0mbieprocess +/homeassistant/components/smarty/ @martinssipenko /homeassistant/components/smhi/ @gjohansson-ST /tests/components/smhi/ @gjohansson-ST /homeassistant/components/sms/ @ocalvo diff --git a/homeassistant/components/smarty/manifest.json b/homeassistant/components/smarty/manifest.json index e8698e27789870..937b18f9807ff6 100644 --- a/homeassistant/components/smarty/manifest.json +++ b/homeassistant/components/smarty/manifest.json @@ -1,7 +1,7 @@ { "domain": "smarty", "name": "Salda Smarty", - "codeowners": ["@z0mbieprocess"], + "codeowners": ["@martinssipenko"], "documentation": "https://www.home-assistant.io/integrations/smarty", "integration_type": "hub", "iot_class": "local_polling", From d4b50605b93cf465f3fedf7c3dbd2908ef91e1b0 Mon Sep 17 00:00:00 2001 From: Martins Sipenko Date: Sun, 18 Aug 2024 13:30:06 +0300 Subject: [PATCH 3/5] Revert "Updated codeowners to myself" This reverts commit 639fef32b90d22117938f864e6ea3c55b0fc5074. --- CODEOWNERS | 2 +- homeassistant/components/smarty/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 8cb992ade19692..6593c02c8a514e 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1324,7 +1324,7 @@ build.json @home-assistant/supervisor /tests/components/smart_meter_texas/ @grahamwetzler /homeassistant/components/smarttub/ @mdz /tests/components/smarttub/ @mdz -/homeassistant/components/smarty/ @martinssipenko +/homeassistant/components/smarty/ @z0mbieprocess /homeassistant/components/smhi/ @gjohansson-ST /tests/components/smhi/ @gjohansson-ST /homeassistant/components/sms/ @ocalvo diff --git a/homeassistant/components/smarty/manifest.json b/homeassistant/components/smarty/manifest.json index 937b18f9807ff6..e8698e27789870 100644 --- a/homeassistant/components/smarty/manifest.json +++ b/homeassistant/components/smarty/manifest.json @@ -1,7 +1,7 @@ { "domain": "smarty", "name": "Salda Smarty", - "codeowners": ["@martinssipenko"], + "codeowners": ["@z0mbieprocess"], "documentation": "https://www.home-assistant.io/integrations/smarty", "integration_type": "hub", "iot_class": "local_polling", From 96af68a833f35d3a4f370588a9758f7332366cf9 Mon Sep 17 00:00:00 2001 From: Martins Sipenko Date: Mon, 19 Aug 2024 07:53:49 +0300 Subject: [PATCH 4/5] Upgraded pysmarty2 to version 0.10.1 which is not pinned to specific pymodbus version --- homeassistant/components/smarty/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/smarty/manifest.json b/homeassistant/components/smarty/manifest.json index e8698e27789870..b83319b674418f 100644 --- a/homeassistant/components/smarty/manifest.json +++ b/homeassistant/components/smarty/manifest.json @@ -6,5 +6,5 @@ "integration_type": "hub", "iot_class": "local_polling", "loggers": ["pymodbus", "pysmarty2"], - "requirements": ["pysmarty2==0.10"] + "requirements": ["pysmarty2==0.10.1"] } From bfc126f178db1d77e68c076ec1a717ffcde2e7f3 Mon Sep 17 00:00:00 2001 From: Martins Sipenko Date: Mon, 19 Aug 2024 21:56:58 +0300 Subject: [PATCH 5/5] Update requirements_all.txt --- requirements_all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_all.txt b/requirements_all.txt index d10dca587a63a0..bd9db65fe70eac 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2208,7 +2208,7 @@ pysmartapp==0.3.5 pysmartthings==0.7.8 # homeassistant.components.smarty -pysmarty2==0.10 +pysmarty2==0.10.1 # homeassistant.components.edl21 pysml==0.0.12