From 66405d5651c18f3ad0be52c4ec2ed79d0b33048b Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 19 Sep 2019 11:49:47 -0700
Subject: [PATCH] Bump TRADFRI (#26731)

* Bump TRADFRI

* Fix test
---
 homeassistant/components/tradfri/manifest.json | 12 +++---------
 requirements_all.txt                           |  2 +-
 requirements_test_all.txt                      |  2 +-
 tests/components/tradfri/test_light.py         |  4 +++-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/tradfri/manifest.json b/homeassistant/components/tradfri/manifest.json
index ba6b21e0028..d847c6df24f 100644
--- a/homeassistant/components/tradfri/manifest.json
+++ b/homeassistant/components/tradfri/manifest.json
@@ -3,17 +3,11 @@
   "name": "Tradfri",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/components/tradfri",
-  "requirements": [
-    "pytradfri[async]==6.0.1"
-  ],
+  "requirements": ["pytradfri[async]==6.3.1"],
   "homekit": {
-    "models": [
-      "TRADFRI"
-    ]
+    "models": ["TRADFRI"]
   },
   "dependencies": [],
   "zeroconf": ["_coap._udp.local."],
-  "codeowners": [
-    "@ggravlingen"
-  ]
+  "codeowners": ["@ggravlingen"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index d880b672d72..ffe2514af60 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1590,7 +1590,7 @@ pytraccar==0.9.0
 pytrackr==0.0.5
 
 # homeassistant.components.tradfri
-pytradfri[async]==6.0.1
+pytradfri[async]==6.3.1
 
 # homeassistant.components.trafikverket_train
 # homeassistant.components.trafikverket_weatherstation
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 69ca7eefe03..049ff0dbd2c 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -356,7 +356,7 @@ python-velbus==2.0.27
 python_awair==0.0.4
 
 # homeassistant.components.tradfri
-pytradfri[async]==6.0.1
+pytradfri[async]==6.3.1
 
 # homeassistant.components.vesync
 pyvesync==1.1.0
diff --git a/tests/components/tradfri/test_light.py b/tests/components/tradfri/test_light.py
index 69fe3bae618..4c691f66af8 100644
--- a/tests/components/tradfri/test_light.py
+++ b/tests/components/tradfri/test_light.py
@@ -4,7 +4,9 @@ from copy import deepcopy
 from unittest.mock import Mock, MagicMock, patch, PropertyMock
 
 import pytest
-from pytradfri.device import Device, LightControl, Light
+from pytradfri.device import Device
+from pytradfri.device.light import Light
+from pytradfri.device.light_control import LightControl
 
 from homeassistant.components import tradfri