github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-28 23:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-05 15:58:18 -06:00
parent 948a6f2134 a517e0ec80
commit d89aeca65a
75 changed files with 1453 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit_tests/test_config_validation.py
+2 -2
View File
@@ -6,7 +6,7 @@ import pytest
import voluptuous as vol
from esphome import config_validation
from esphome.components.esp32.const import (
from esphome.components.esp32 import (
VARIANT_ESP32,
VARIANT_ESP32C2,
VARIANT_ESP32C3,
@@ -221,7 +221,7 @@ def hex_int__valid(value):
],
)
def test_split_default(framework, platform, variant, full, idf, arduino, simple):
from esphome.components.esp32.const import KEY_ESP32
from esphome.components.esp32 import KEY_ESP32
from esphome.const import (
KEY_CORE,
KEY_TARGET_FRAMEWORK,
tests/unit_tests/test_main.py
+1 -1
View File
@@ -35,7 +35,7 @@ from esphome.__main__ import (
upload_program,
upload_using_esptool,
)
from esphome.components.esp32.const import KEY_ESP32, KEY_VARIANT, VARIANT_ESP32
from esphome.components.esp32 import KEY_ESP32, KEY_VARIANT, VARIANT_ESP32
from esphome.const import (
CONF_API,
CONF_BROKER,