sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-01 19:02:18 +01:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into bump-1.18.0b1

Browse Source
This commit is contained in:
Jesse Hills
2021-05-10 07:54:06 +12:00
parent 0fe61d9ec7 cafdcaec29
commit 44562dbef1
139 changed files with 7201 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
script/build_jsonschema.py
View File

@@ -62,7 +62,7 @@ def add_definition_array_or_single_object(ref):
def add_core():
from esphome.core_config import CONFIG_SCHEMA
from esphome.core.config import CONFIG_SCHEMA
base_props["esphome"] = get_jschema("esphome", CONFIG_SCHEMA.schema)

1
script/ci-custom.py
View File

@@ -405,6 +405,7 @@ ARDUINO_FORBIDDEN_RE = r"[^\w\d](" + r"|".join(ARDUINO_FORBIDDEN) + r")\(.*"
include=cpp_include,
exclude=[
"esphome/components/mqtt/custom_mqtt_device.h",
"esphome/components/sun/sun.cpp",
"esphome/core/esphal.*",
],
)