Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 41c3338

Browse files
dotvezzdotvezz
authored
Merge pull request #277 from libdyson-wg/remove-vendored-libdyson
Removes vendored libdyson, replaces with pypi requirement
2 parents 2f88870 + e887f71 commit 41c3338

38 files changed

+39
-2659
lines changed

‎custom_components/dyson_local/__init__.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
DATA_DISCOVERY,
2525
DOMAIN,
2626
)
27-
from .vendor.libdyson import (
27+
from libdyson import (
2828
Dyson360Eye,
2929
Dyson360Heurist,
3030
Dyson360VisNav,
@@ -34,10 +34,10 @@
3434
MessageType,
3535
get_device,
3636
)
37-
from .vendor.libdyson.cloud import DysonAccount, DysonAccountCN
38-
from .vendor.libdyson.discovery import DysonDiscovery
39-
from .vendor.libdyson.dyson_device import DysonDevice
40-
from .vendor.libdyson.exceptions import (
37+
from libdyson.cloud import DysonAccount, DysonAccountCN
38+
from libdyson.discovery import DysonDiscovery
39+
from libdyson.dyson_device import DysonDevice
40+
from libdyson.exceptions import (
4141
DysonException,
4242
DysonInvalidAuth,
4343
DysonLoginFailure,

‎custom_components/dyson_local/binary_sensor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from typing import Callable
44

5-
from .vendor.libdyson import (
5+
from libdyson import (
66
Dyson360Eye,
77
Dyson360Heurist,
88
Dyson360VisNav,

‎custom_components/dyson_local/camera.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from homeassistant.config_entries import ConfigEntry
88
from homeassistant.components.camera import Camera
99

10-
from .vendor.libdyson.const import DEVICE_TYPE_360_EYE, DEVICE_TYPE_360_HEURIST
11-
from .vendor.libdyson.cloud.cloud_360_eye import DysonCloud360Eye
12-
from .vendor.libdyson.cloud import DysonDeviceInfo
10+
from libdyson.const import DEVICE_TYPE_360_EYE, DEVICE_TYPE_360_HEURIST
11+
from libdyson.cloud.cloud_360_eye import DysonCloud360Eye
12+
from libdyson.cloud import DysonDeviceInfo
1313

1414
from .cloud.const import DATA_ACCOUNT, DATA_DEVICES
1515
from .const import DOMAIN

‎custom_components/dyson_local/climate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from .const import DATA_DEVICES, DOMAIN
77
from .utils import environmental_property
8-
from .vendor.libdyson import DysonPureHotCoolLink
8+
from libdyson import DysonPureHotCoolLink
99

1010
from homeassistant.components.climate import ClimateEntity
1111
from homeassistant.components.climate.const import (

‎custom_components/dyson_local/config_flow.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import threading
55
from typing import Optional
66

7-
from .vendor.libdyson import DEVICE_TYPE_NAMES, get_device, get_mqtt_info_from_wifi_info
8-
from .vendor.libdyson.cloud import DysonDeviceInfo
9-
from .vendor.libdyson.discovery import DysonDiscovery
10-
from .vendor.libdyson.exceptions import (
7+
from libdyson import DEVICE_TYPE_NAMES, get_device, get_mqtt_info_from_wifi_info
8+
from libdyson.cloud import DysonDeviceInfo
9+
from libdyson.discovery import DysonDiscovery
10+
from libdyson.exceptions import (
1111
DysonException,
1212
DysonFailedToParseWifiInfo,
1313
DysonInvalidCredential,
@@ -17,10 +17,10 @@
1717
DysonInvalidAccountStatus,
1818
DysonLoginFailure,
1919
)
20-
from .vendor.libdyson.cloud import DysonAccount, DysonAccountCN, REGIONS
20+
from libdyson.cloud import DysonAccount, DysonAccountCN, REGIONS
2121

2222
# Import device type constants for mapping
23-
from .vendor.libdyson.const import (
23+
from libdyson.const import (
2424
DEVICE_TYPE_360_EYE,
2525
DEVICE_TYPE_360_HEURIST,
2626
DEVICE_TYPE_360_VIS_NAV,

‎custom_components/dyson_local/fan.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import math
55
from typing import Any, Callable, List, Mapping, Optional
66

7-
from .vendor.libdyson import DysonPureCool, DysonPureCoolLink, MessageType
7+
from libdyson import DysonPureCool, DysonPureCoolLink, MessageType
88
import voluptuous as vol
99

1010
from homeassistant.components.fan import (

‎custom_components/dyson_local/humidifier.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from typing import Callable, Optional
44

5-
from .vendor.libdyson import MessageType
5+
from libdyson import MessageType
66

77
from homeassistant.components.humidifier import (
88
HumidifierDeviceClass,

‎custom_components/dyson_local/manifest.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"domain": "dyson_local",
33
"name": "Dyson",
4-
"codeowners": ["@libdyson-wg", "@dotvezz"],
4+
"codeowners": ["@libdyson-wg", "@dotvezz", "@cmgrayb"],
55
"config_flow": true,
66
"dependencies": ["mqtt", "zeroconf"],
77
"documentation": "https://github.com/libdyson-wg/ha-dyson",
88
"import_executor": true,
99
"iot_class": "local_push",
1010
"issue_tracker": "https://github.com/libdyson-wg/ha-dyson/issues",
11-
"version": "1.6.0"
11+
"requirements": ["libdyson-neon==1.6.0"],
12+
"version": "1.7.0"
1213
}

‎custom_components/dyson_local/select.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from typing import Callable
44

5-
from .vendor.libdyson import (
5+
from libdyson import (
66
DysonPureCoolLink,
77
DysonPureHotCoolLink,
88
DysonPurifierHumidifyCool,
@@ -11,7 +11,7 @@
1111
WaterHardness,
1212
DysonBigQuiet,
1313
)
14-
from .vendor.libdyson.const import AirQualityTarget
14+
from libdyson.const import AirQualityTarget
1515

1616
from homeassistant.components.select import SelectEntity
1717
from homeassistant.config_entries import ConfigEntry

‎custom_components/dyson_local/sensor.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from typing import Callable, Union, Optional
44

5-
from .vendor.libdyson import (
5+
from libdyson import (
66
Dyson360Eye,
77
Dyson360Heurist,
88
Dyson360VisNav,
@@ -12,8 +12,8 @@
1212
DysonBigQuiet,
1313
)
1414

15-
from .vendor.libdyson.const import MessageType
16-
from .vendor.libdyson.dyson_device import DysonFanDevice
15+
from libdyson.const import MessageType
16+
from libdyson.dyson_device import DysonFanDevice
1717

1818
from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass, SensorEntity
1919
from homeassistant.config_entries import ConfigEntry

0 commit comments

Comments
 (0)