From edc763b7d29d7d84796fd0811ecc8addbabddf65 Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Thu, 6 Mar 2025 13:22:49 +0100
Subject: [PATCH] Bump pysmartthings to 2.6.1 (#139936)
* Bump pysmartthings to 2.6.1
* Bump pysmartthings to 2.6.1
---
homeassistant/components/smartthings/entity.py | 4 +++-
homeassistant/components/smartthings/manifest.json | 2 +-
requirements_all.txt | 2 +-
requirements_test_all.txt | 2 +-
.../fixtures/devices/da_ac_rac_000001.json | 14 +++-----------
.../smartthings/snapshots/test_init.ambr | 6 +++---
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/homeassistant/components/smartthings/entity.py b/homeassistant/components/smartthings/entity.py
index 542401109ad..c2637174a5c 100644
--- a/homeassistant/components/smartthings/entity.py
+++ b/homeassistant/components/smartthings/entity.py
@@ -60,7 +60,9 @@ class SmartThingsEntity(Entity):
self._attr_device_info.update(
{
"manufacturer": ocf.manufacturer_name,
- "model": ocf.model_number.split("|")[0],
+ "model": (
+ (ocf.model_number.split("|")[0]) if ocf.model_number else None
+ ),
"hw_version": ocf.hardware_version,
"sw_version": ocf.firmware_version,
}
diff --git a/homeassistant/components/smartthings/manifest.json b/homeassistant/components/smartthings/manifest.json
index 22926e70ba0..9efa8b81186 100644
--- a/homeassistant/components/smartthings/manifest.json
+++ b/homeassistant/components/smartthings/manifest.json
@@ -29,5 +29,5 @@
"documentation": "https://www.home-assistant.io/integrations/smartthings",
"iot_class": "cloud_push",
"loggers": ["pysmartthings"],
- "requirements": ["pysmartthings==2.5.0"]
+ "requirements": ["pysmartthings==2.6.1"]
}
diff --git a/requirements_all.txt b/requirements_all.txt
index cd2f8700256..7f8bede248b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2310,7 +2310,7 @@ pysma==0.7.5
pysmappee==0.2.29
# homeassistant.components.smartthings
-pysmartthings==2.5.0
+pysmartthings==2.6.1
# homeassistant.components.smarty
pysmarty2==0.10.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 6c522060143..6a04b6d4337 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1882,7 +1882,7 @@ pysma==0.7.5
pysmappee==0.2.29
# homeassistant.components.smartthings
-pysmartthings==2.5.0
+pysmartthings==2.6.1
# homeassistant.components.smarty
pysmarty2==0.10.2
diff --git a/tests/components/smartthings/fixtures/devices/da_ac_rac_000001.json b/tests/components/smartthings/fixtures/devices/da_ac_rac_000001.json
index d831e15a86b..cc4e13784bf 100644
--- a/tests/components/smartthings/fixtures/devices/da_ac_rac_000001.json
+++ b/tests/components/smartthings/fixtures/devices/da_ac_rac_000001.json
@@ -286,18 +286,10 @@
"id": "60fbc713-8da5-315d-b31a-6d6dcde4be7b"
},
"ocf": {
- "ocfDeviceType": "oic.d.airconditioner",
- "name": "[room a/c] Samsung",
- "specVersion": "core.1.1.0",
- "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+ "ocfDeviceType": "x.com.st.d.sensor.light",
"manufacturerName": "Samsung Electronics",
- "modelNumber": "ARTIK051_KRAC_18K|10193441|60010132001111110200000000000000",
- "platformVersion": "0G3MPDCKA00010E",
- "platformOS": "TizenRT2.0",
- "hwVersion": "1.0",
- "firmwareVersion": "0.1.0",
- "vendorId": "DA-AC-RAC-000001",
- "lastSignupTime": "2021-04-06T16:43:27.889445Z",
+ "vendorId": "VD-Sensor.Light-2023",
+ "lastSignupTime": "2025-01-08T02:32:04.631093137Z",
"transferCandidate": false,
"additionalAuthCodeRequired": false
},
diff --git a/tests/components/smartthings/snapshots/test_init.ambr b/tests/components/smartthings/snapshots/test_init.ambr
index fb856ae32d6..12745ea8f2c 100644
--- a/tests/components/smartthings/snapshots/test_init.ambr
+++ b/tests/components/smartthings/snapshots/test_init.ambr
@@ -207,7 +207,7 @@
}),
'disabled_by': None,
'entry_type': None,
- 'hw_version': '1.0',
+ 'hw_version': None,
'id': <ANY>,
'identifiers': set({
tuple(
@@ -219,14 +219,14 @@
'labels': set({
}),
'manufacturer': 'Samsung Electronics',
- 'model': 'ARTIK051_KRAC_18K',
+ 'model': None,
'model_id': None,
'name': 'AC Office Granit',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': 'Theater',
- 'sw_version': '0.1.0',
+ 'sw_version': None,
'via_device_id': None,
})
# ---
--
GitLab