Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 13:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2966 from esphome/bump-2021.12.3

Browse source 
2021.12.3
This commit is contained in:
Jesse Hills 2021-12-30 14:54:49 +13:00 committed by GitHub
commit 50848c2f4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/Dockerfile
View file

@ -27,7 +27,7 @@ RUN \
python3-cryptography=3.3.2-1 \ python3-cryptography=3.3.2-1 \
iputils-ping=3:20210202-1 \ iputils-ping=3:20210202-1 \
git=1:2.30.2-1 \ git=1:2.30.2-1 \
curl=7.74.0-1.3+b1 \ curl=7.74.0-1.3+deb11u1 \
&& rm -rf \ && rm -rf \
/tmp/* \ /tmp/* \
/var/{cache,log}/* \ /var/{cache,log}/* \
@ -64,7 +64,7 @@ RUN \
# Copy esphome and install # Copy esphome and install
COPY . /esphome COPY . /esphome
RUN pip3 install --no-cache-dir -e /esphome RUN pip3 install --no-cache-dir /esphome
# Settings for dashboard # Settings for dashboard
ENV USERNAME="" PASSWORD="" ENV USERNAME="" PASSWORD=""
@ -112,7 +112,7 @@ RUN \
# Copy esphome and install # Copy esphome and install
COPY . /esphome COPY . /esphome
RUN pip3 install --no-cache-dir -e /esphome RUN pip3 install --no-cache-dir /esphome
# Labels # Labels
LABEL \ LABEL \

2
esphome/components/dht/sensor.py
View file

@ -33,7 +33,7 @@ DHT = dht_ns.class_("DHT", cg.PollingComponent)
CONFIG_SCHEMA = cv.Schema( CONFIG_SCHEMA = cv.Schema(
{ {
cv.GenerateID(): cv.declare_id(DHT), cv.GenerateID(): cv.declare_id(DHT),
cv.Required(CONF_PIN): pins.gpio_input_pin_schema, cv.Required(CONF_PIN): pins.internal_gpio_input_pin_schema,
cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema( cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
unit_of_measurement=UNIT_CELSIUS, unit_of_measurement=UNIT_CELSIUS,
accuracy_decimals=1, accuracy_decimals=1,

57
esphome/components/web_server/__init__.py
View file

@ -22,31 +22,38 @@ AUTO_LOAD = ["json", "web_server_base"]
web_server_ns = cg.esphome_ns.namespace("web_server") web_server_ns = cg.esphome_ns.namespace("web_server")
WebServer = web_server_ns.class_("WebServer", cg.Component, cg.Controller) WebServer = web_server_ns.class_("WebServer", cg.Component, cg.Controller)
CONFIG_SCHEMA = cv.Schema( CONFIG_SCHEMA = cv.All(
{ cv.Schema(
cv.GenerateID(): cv.declare_id(WebServer), {
cv.Optional(CONF_PORT, default=80): cv.port, cv.GenerateID(): cv.declare_id(WebServer),
cv.Optional( cv.Optional(CONF_PORT, default=80): cv.port,
CONF_CSS_URL, default="https://esphome.io/_static/webserver-v1.min.css" cv.Optional(
): cv.string, CONF_CSS_URL, default="https://esphome.io/_static/webserver-v1.min.css"
cv.Optional(CONF_CSS_INCLUDE): cv.file_, ): cv.string,
cv.Optional( cv.Optional(CONF_CSS_INCLUDE): cv.file_,
CONF_JS_URL, default="https://esphome.io/_static/webserver-v1.min.js" cv.Optional(
): cv.string, CONF_JS_URL, default="https://esphome.io/_static/webserver-v1.min.js"
cv.Optional(CONF_JS_INCLUDE): cv.file_, ): cv.string,
cv.Optional(CONF_AUTH): cv.Schema( cv.Optional(CONF_JS_INCLUDE): cv.file_,
{ cv.Optional(CONF_AUTH): cv.Schema(
cv.Required(CONF_USERNAME): cv.All(cv.string_strict, cv.Length(min=1)), {
cv.Required(CONF_PASSWORD): cv.All(cv.string_strict, cv.Length(min=1)), cv.Required(CONF_USERNAME): cv.All(
} cv.string_strict, cv.Length(min=1)
), ),
cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id( cv.Required(CONF_PASSWORD): cv.All(
web_server_base.WebServerBase cv.string_strict, cv.Length(min=1)
), ),
cv.Optional(CONF_INCLUDE_INTERNAL, default=False): cv.boolean, }
cv.Optional(CONF_OTA, default=True): cv.boolean, ),
} cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id(
).extend(cv.COMPONENT_SCHEMA) web_server_base.WebServerBase
),
cv.Optional(CONF_INCLUDE_INTERNAL, default=False): cv.boolean,
cv.Optional(CONF_OTA, default=True): cv.boolean,
},
).extend(cv.COMPONENT_SCHEMA),
cv.only_with_arduino,
)
@coroutine_with_priority(40.0) @coroutine_with_priority(40.0)

2
esphome/const.py
View file

@ -1,6 +1,6 @@
"""Constants used by esphome.""" """Constants used by esphome."""
__version__ = "2021.12.2" __version__ = "2021.12.3"
ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_" ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"