Skip to content

Commit

Permalink
Remove fan_common module (#1744)
Browse files Browse the repository at this point in the history
This inlines the necessary enums inside integrations they were used.
This should not be a breaking change as the `fan_common` was never
directly exported.
  • Loading branch information
rytilahti committed Feb 21, 2023
1 parent 69a5ff9 commit c742566
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 25 deletions.
17 changes: 0 additions & 17 deletions miio/fan_common.py

This file was deleted.

13 changes: 12 additions & 1 deletion miio/integrations/dmaker/fan/fan.py
@@ -1,10 +1,21 @@
import enum
from typing import Any, Dict, Optional

import click

from miio import Device, DeviceStatus
from miio.click_common import EnumType, command, format_output
from miio.fan_common import MoveDirection, OperationMode


class MoveDirection(enum.Enum):
Left = "left"
Right = "right"


class OperationMode(enum.Enum):
Normal = "normal"
Nature = "nature"


MODEL_FAN_P5 = "dmaker.fan.p5"

Expand Down
12 changes: 11 additions & 1 deletion miio/integrations/dmaker/fan/fan_miot.py
Expand Up @@ -5,7 +5,17 @@

from miio import DeviceStatus, MiotDevice
from miio.click_common import EnumType, command, format_output
from miio.fan_common import MoveDirection, OperationMode


class OperationMode(enum.Enum):
Normal = "normal"
Nature = "nature"


class MoveDirection(enum.Enum):
Left = "left"
Right = "right"


MODEL_FAN_P9 = "dmaker.fan.p9"
MODEL_FAN_P10 = "dmaker.fan.p10"
Expand Down
3 changes: 1 addition & 2 deletions miio/integrations/dmaker/fan/test_fan.py
Expand Up @@ -2,10 +2,9 @@

import pytest

from miio.fan_common import OperationMode
from miio.tests.dummies import DummyDevice

from .fan import MODEL_FAN_P5, FanP5, FanStatusP5
from .fan import MODEL_FAN_P5, FanP5, FanStatusP5, OperationMode


class DummyFanP5(DummyDevice, FanP5):
Expand Down
14 changes: 13 additions & 1 deletion miio/integrations/zhimi/fan/fan.py
@@ -1,3 +1,4 @@
import enum
import logging
from typing import Any, Dict, Optional

Expand All @@ -6,7 +7,18 @@
from miio import Device, DeviceStatus
from miio.click_common import EnumType, command, format_output
from miio.devicestatus import sensor, setting
from miio.fan_common import LedBrightness, MoveDirection


class MoveDirection(enum.Enum):
Left = "left"
Right = "right"


class LedBrightness(enum.Enum):
Bright = 0
Dim = 1
Off = 2


_LOGGER = logging.getLogger(__name__)

Expand Down
3 changes: 1 addition & 2 deletions miio/integrations/zhimi/fan/test_zhimi_miot.py
Expand Up @@ -2,11 +2,10 @@

import pytest

from miio.fan_common import OperationMode
from miio.tests.dummies import DummyMiotDevice

from . import FanZA5
from .zhimi_miot import MODEL_FAN_ZA5, OperationModeFanZA5
from .zhimi_miot import MODEL_FAN_ZA5, OperationMode, OperationModeFanZA5


class DummyFanZA5(DummyMiotDevice, FanZA5):
Expand Down
12 changes: 11 additions & 1 deletion miio/integrations/zhimi/fan/zhimi_miot.py
Expand Up @@ -5,9 +5,19 @@

from miio import DeviceException, DeviceStatus, MiotDevice
from miio.click_common import EnumType, command, format_output
from miio.fan_common import MoveDirection, OperationMode
from miio.utils import deprecated


class OperationMode(enum.Enum):
Normal = "normal"
Nature = "nature"


class MoveDirection(enum.Enum):
Left = "left"
Right = "right"


MODEL_FAN_ZA5 = "zhimi.fan.za5"

MIOT_MAPPING = {
Expand Down

0 comments on commit c742566

Please sign in to comment.