From e4f6f738e83b2b3d5e786d42c53dea867a435b29 Mon Sep 17 00:00:00 2001
From: Teemu R <tpr@iki.fi>
Date: Tue, 19 Jul 2022 18:56:41 +0200
Subject: [PATCH] Bump python-miio to 0.5.12 (#75415)
* Bump python-miio to 0.5.12
* Fix imports
---
homeassistant/components/xiaomi_miio/fan.py | 16 +++++++++++----
.../components/xiaomi_miio/humidifier.py | 12 ++++++++---
.../components/xiaomi_miio/manifest.json | 2 +-
.../components/xiaomi_miio/select.py | 20 ++++++++++++++-----
requirements_all.txt | 2 +-
requirements_test_all.txt | 2 +-
6 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py
index 177f84679ee..aa4b8a8a1bc 100644
--- a/homeassistant/components/xiaomi_miio/fan.py
+++ b/homeassistant/components/xiaomi_miio/fan.py
@@ -7,14 +7,22 @@ import logging
import math
from typing import Any
-from miio.airfresh import OperationMode as AirfreshOperationMode
-from miio.airfresh_t2017 import OperationMode as AirfreshOperationModeT2017
-from miio.airpurifier import OperationMode as AirpurifierOperationMode
-from miio.airpurifier_miot import OperationMode as AirpurifierMiotOperationMode
from miio.fan_common import (
MoveDirection as FanMoveDirection,
OperationMode as FanOperationMode,
)
+from miio.integrations.airpurifier.dmaker.airfresh_t2017 import (
+ OperationMode as AirfreshOperationModeT2017,
+)
+from miio.integrations.airpurifier.zhimi.airfresh import (
+ OperationMode as AirfreshOperationMode,
+)
+from miio.integrations.airpurifier.zhimi.airpurifier import (
+ OperationMode as AirpurifierOperationMode,
+)
+from miio.integrations.airpurifier.zhimi.airpurifier_miot import (
+ OperationMode as AirpurifierMiotOperationMode,
+)
from miio.integrations.fan.zhimi.zhimi_miot import (
OperationModeFanZA5 as FanZA5OperationMode,
)
diff --git a/homeassistant/components/xiaomi_miio/humidifier.py b/homeassistant/components/xiaomi_miio/humidifier.py
index 0a9543ac604..b5a5e738ea0 100644
--- a/homeassistant/components/xiaomi_miio/humidifier.py
+++ b/homeassistant/components/xiaomi_miio/humidifier.py
@@ -2,9 +2,15 @@
import logging
import math
-from miio.airhumidifier import OperationMode as AirhumidifierOperationMode
-from miio.airhumidifier_miot import OperationMode as AirhumidifierMiotOperationMode
-from miio.airhumidifier_mjjsq import OperationMode as AirhumidifierMjjsqOperationMode
+from miio.integrations.humidifier.deerma.airhumidifier_mjjsq import (
+ OperationMode as AirhumidifierMjjsqOperationMode,
+)
+from miio.integrations.humidifier.zhimi.airhumidifier import (
+ OperationMode as AirhumidifierOperationMode,
+)
+from miio.integrations.humidifier.zhimi.airhumidifier_miot import (
+ OperationMode as AirhumidifierMiotOperationMode,
+)
from homeassistant.components.humidifier import (
HumidifierDeviceClass,
diff --git a/homeassistant/components/xiaomi_miio/manifest.json b/homeassistant/components/xiaomi_miio/manifest.json
index 7157e32299a..0f1a9dd92aa 100644
--- a/homeassistant/components/xiaomi_miio/manifest.json
+++ b/homeassistant/components/xiaomi_miio/manifest.json
@@ -3,7 +3,7 @@
"name": "Xiaomi Miio",
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/xiaomi_miio",
- "requirements": ["construct==2.10.56", "micloud==0.5", "python-miio==0.5.11"],
+ "requirements": ["construct==2.10.56", "micloud==0.5", "python-miio==0.5.12"],
"codeowners": ["@rytilahti", "@syssi", "@starkillerOG", "@bieniu"],
"zeroconf": ["_miio._udp.local."],
"iot_class": "local_polling",
diff --git a/homeassistant/components/xiaomi_miio/select.py b/homeassistant/components/xiaomi_miio/select.py
index 5f8fe8df591..b7e6a65775e 100644
--- a/homeassistant/components/xiaomi_miio/select.py
+++ b/homeassistant/components/xiaomi_miio/select.py
@@ -3,12 +3,22 @@ from __future__ import annotations
from dataclasses import dataclass
-from miio.airfresh import LedBrightness as AirfreshLedBrightness
-from miio.airhumidifier import LedBrightness as AirhumidifierLedBrightness
-from miio.airhumidifier_miot import LedBrightness as AirhumidifierMiotLedBrightness
-from miio.airpurifier import LedBrightness as AirpurifierLedBrightness
-from miio.airpurifier_miot import LedBrightness as AirpurifierMiotLedBrightness
from miio.fan_common import LedBrightness as FanLedBrightness
+from miio.integrations.airpurifier.zhimi.airfresh import (
+ LedBrightness as AirfreshLedBrightness,
+)
+from miio.integrations.airpurifier.zhimi.airpurifier import (
+ LedBrightness as AirpurifierLedBrightness,
+)
+from miio.integrations.airpurifier.zhimi.airpurifier_miot import (
+ LedBrightness as AirpurifierMiotLedBrightness,
+)
+from miio.integrations.humidifier.zhimi.airhumidifier import (
+ LedBrightness as AirhumidifierLedBrightness,
+)
+from miio.integrations.humidifier.zhimi.airhumidifier_miot import (
+ LedBrightness as AirhumidifierMiotLedBrightness,
+)
from homeassistant.components.select import SelectEntity, SelectEntityDescription
from homeassistant.config_entries import ConfigEntry
diff --git a/requirements_all.txt b/requirements_all.txt
index d43ee87da12..0606ec11933 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1930,7 +1930,7 @@ python-kasa==0.5.0
# python-lirc==1.2.3
# homeassistant.components.xiaomi_miio
-python-miio==0.5.11
+python-miio==0.5.12
# homeassistant.components.mpd
python-mpd2==3.0.5
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index ee02d6f05a2..8148e114d6b 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1298,7 +1298,7 @@ python-juicenet==1.1.0
python-kasa==0.5.0
# homeassistant.components.xiaomi_miio
-python-miio==0.5.11
+python-miio==0.5.12
# homeassistant.components.nest
python-nest==4.2.0
--
GitLab