Merge pull request #4 from sinricpro/develop

Develop

Author: kakopappa

custom_components/sinricpro/config_flow.py

@@ -5,10 +5,10 @@
 import logging
 from typing import Any
 
-import voluptuous as vol  # type: ignore[import-untyped]
+import voluptuous as vol
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.config_entries import ConfigFlow
-from homeassistant.config_entries import ConfigFlowResult  # type: ignore[attr-defined]
+from homeassistant.config_entries import ConfigFlowResult
 from homeassistant.config_entries import OptionsFlow
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import callback
@@ -43,7 +43,7 @@ def __init__(self) -> None:
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> SinricProOptionsFlow:
         """Get the options flow for this handler."""
-        return SinricProOptionsFlow(config_entry)
+        return SinricProOptionsFlow()
 
     async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         """Handle the initial step.
@@ -201,14 +201,6 @@ async def _validate_api_key(self, api_key: str) -> str | None:
 class SinricProOptionsFlow(OptionsFlow):
     """Handle options flow for SinricPro."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialize options flow.
-
-        Args:
-            config_entry: The config entry.
-        """
-        self.config_entry = config_entry
-
     async def async_step_init(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         """Manage the options.
 

custom_components/sinricpro/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "cloud_push",
   "issue_tracker": "https://github.com/sinricpro/homeassistant-sinricpro/issues",
   "requirements": ["aiohttp>=3.9.0"],
-  "version": "2.0.0"
+  "version": "2.0.1"
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sinricpro-homeassistant"
-version = "2.0.0"
+version = "2.0.1"
 description = "SinricPro integration for Home Assistant"
 readme = "README.md"
 license = {text = "MIT"}
@@ -62,7 +62,7 @@ force-single-line = true
 known-first-party = ["custom_components.sinricpro"]
 
 [tool.mypy]
-python_version = "3.11"
+python_version = "3.12"
 warn_return_any = true
 warn_unused_ignores = true
 disallow_untyped_defs = true

requirements_test.txt

@@ -1,6 +1,6 @@
-pytest>=8.0.0,<8.1
-pytest-asyncio
-pytest-cov
+# pytest, pytest-asyncio and pytest-cov are provided (and version-pinned to
+# match Home Assistant) by pytest-homeassistant-custom-component. Do not pin
+# them here or pip resolution will conflict with the HA-pinned versions.
 pytest-homeassistant-custom-component>=0.13.0
 aioresponses>=0.7.6
 ruff>=0.4.0

tests/test_api.py

@@ -27,8 +27,17 @@ def api_url() -> str:
 
 @pytest.fixture
 async def session() -> aiohttp.ClientSession:
-    """Create aiohttp session."""
-    async with aiohttp.ClientSession() as session:
+    """Create aiohttp session.
+
+    Use the ThreadedResolver instead of aiohttp's default aiodns/pycares
+    resolver. pycares eagerly starts a process-global daemon thread
+    (``_run_safe_shutdown_loop``) when its DNS channel is created, and that
+    thread never exits, which trips pytest-homeassistant-custom-component's
+    ``verify_cleanup`` thread-leak assertion at teardown. aioresponses mocks
+    every request here, so the resolver is never actually used.
+    """
+    connector = aiohttp.TCPConnector(resolver=aiohttp.ThreadedResolver())
+    async with aiohttp.ClientSession(connector=connector) as session:
         yield session