From ba54e8d6910f064b399fdfd34ab003a863a241ef Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 17 Aug 2022 23:42:39 -0400 Subject: [PATCH 1/2] Use Protocol type annotation --- adafruit_lifx.py | 13 ++++--------- requirements.txt | 1 + 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/adafruit_lifx.py b/adafruit_lifx.py index 579a199..f88ca6e 100644 --- a/adafruit_lifx.py +++ b/adafruit_lifx.py @@ -35,14 +35,9 @@ LIFX_URL = "https://api.lifx.com/v1/lights/" try: - from typing import Union, Dict, Any - from adafruit_esp32spi.adafruit_esp32spi_wifimanager import ESPSPI_WiFiManager - from adafruit_espatcontrol.adafruit_espatcontrol_wifimanager import ( - ESPAT_WiFiManager, - ) - from adafruit_requests import Session, Response - - WifiManagerType = Union[ESPSPI_WiFiManager, ESPAT_WiFiManager, Session] + from typing import Dict, Any + from circuitpython_typing.http import HTTPProtocol + from adafruit_requests import Response except ImportError: pass @@ -55,7 +50,7 @@ class LIFX: :param str lifx_token: LIFX API token (https://api.developer.lifx.com/docs/authentication) """ - def __init__(self, wifi_manager: WifiManagerType, lifx_token: str) -> None: + def __init__(self, wifi_manager: HTTPProtocol, lifx_token: str) -> None: wifi_type = str(type(wifi_manager)) allowed_wifi_types = ("ESPSPI_WiFiManager", "ESPAT_WiFiManager", "Session") if any(x in wifi_type for x in allowed_wifi_types): diff --git a/requirements.txt b/requirements.txt index bc99f3a..e9e75dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ # SPDX-License-Identifier: Unlicense Adafruit-Blinka +adafruit-circuitpython-typing~=1.8 adafruit-circuitpython-requests adafruit-circuitpython-esp32spi adafruit-circuitpython-esp-atcontrol From 17aba70ac934044bd7a66ee862f4de60cbd2a425 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 17 Aug 2022 23:43:29 -0400 Subject: [PATCH 2/2] Remove unused libraries from requirements.txt --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e9e75dc..b59b979 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,3 @@ Adafruit-Blinka adafruit-circuitpython-typing~=1.8 adafruit-circuitpython-requests -adafruit-circuitpython-esp32spi -adafruit-circuitpython-esp-atcontrol