Merge branch 'esphome:current' into current

.github/dependabot.yml

@@ -5,3 +5,7 @@ updates:
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: daily

.github/workflows/component-image.yml

@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       name: ${{ steps.get_component.outputs.name }}
+      name_lower: ${{ steps.get_component.outputs.name_lower }}
       comment_id: ${{ steps.create-comment.outputs.result }}
     steps:
       - name: Comment
@@ -35,6 +36,7 @@ jobs:
           comment="${{ github.event.comment.body }}"
           component=$(echo $comment | sed -n 's/^@esphomebot generate image //p')
           echo "name=$component" >> $GITHUB_OUTPUT
+          echo "name_lower=${component,,}" >> $GITHUB_OUTPUT
 
   generate:
     name: Generate
@@ -48,11 +50,11 @@ jobs:
           component: ${{ needs.prepare.outputs.name }}
 
       - name: Upload
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.4.3
         id: upload-artifact
         with:
           name: ${{ needs.prepare.outputs.name }}
-          path: ${{ needs.prepare.outputs.name }}.svg
+          path: ${{ needs.prepare.outputs.name_lower }}.svg
 
       - name: Update Comment
         uses: actions/[email protected]

.github/workflows/docker.yml

@@ -9,6 +9,11 @@ on:
       - requirements.txt
       - Dockerfile
       - .github/workflows/docker.yml
+  pull_request:
+    paths:
+      - requirements.txt
+      - Dockerfile
+      - .github/workflows/docker.yml
 
 permissions:
   contents: read
@@ -25,7 +30,7 @@ jobs:
           repo: cloudcannon/pagefind
       -
         name: Checkout source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -34,11 +39,13 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -50,7 +57,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64
           tags: |
             esphome/esphome-docs:latest

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ on:
 
 permissions:
   contents: read
-  
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -23,11 +23,11 @@ jobs:
       uses: jaxxstorm/[email protected]
       with:
           repo: cloudcannon/pagefind
-    - uses: actions/checkout@v4.1.7
-    - name: Set up Python 3.8
+    - uses: actions/checkout@v4.2.2
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.12
     - name: Install dependencies
       run: pip install -r requirements.txt -r requirements_test.txt
     - name: Register problem matchers

Dockerfile

@@ -31,7 +31,7 @@ WORKDIR /workspaces/esphome-docs
 ENV PATH="${PATH}:/home/esphome/.local/bin"
 
 COPY requirements.txt ./
-RUN pip3 install --no-cache-dir --no-binary :all: -r requirements.txt
+RUN pip3 install --no-cache-dir -r requirements.txt
 
 EXPOSE 8000
 

Doxygen

@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2024.9.0-dev
+PROJECT_NUMBER         = 2024.10.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Makefile

@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2024.8.1
+ESPHOME_REF = 2024.10.2
 PAGEFIND_VERSION=1.1.0
 PAGEFIND=pagefind
 NET_PAGEFIND=../pagefindbin/pagefind

_static/custom.css

@@ -282,6 +282,10 @@ div.body p, div.body dd, div.body li, div.body blockquote {
     display: none;
 }
 
+.sphinx-tabs-tab {
+  line-height: 20px;
+}
+
 /* New branding changes */
 
 div.body h1, div.body h2, div.body h3, div.body h4, div.body h5, div.body h6, div.sphinxsidebar h3, div.sphinxsidebar h4, div.admonition p.admonition-title {
@@ -360,6 +364,16 @@ img.logo {
     background-color: #212121;
   }
 
+  .sphinx-tabs-panel {
+    background: #212121;
+  }
+
+  .sphinx-tabs-tab {
+    color: #3fc3ff !important;
+    background: #212121 !important;
+    margin: 0 !important;
+  }
+
   img.logo {
     content: url("/_static/logo-text-on-dark.svg");
   }

_static/version

@@ -1 +1 @@
-2024.9.0-dev
+2024.10.2

automations/actions.rst

@@ -191,8 +191,8 @@ time period.
 ``if`` Action
 *************
 
-This action first evaluated a certain condition (``if:``) and then either
-executes the ``then:`` branch or the ``else:`` branch depending on the output of the condition.
+This action first evaluates the ``condition:`` and then either
+executes the ``then:`` branch if the condition returns true or the ``else:`` branch if the condition returns false.
 
 After the chosen branch (``then`` or ``else``) is done with execution, the next action is performed.
 

changelog/2023.11.0.rst

@@ -27,7 +27,7 @@ ESPHome 2023.11.0 - 15th November 2023
     ZH/LT-01 Climate, components/climate/climate_ir, air-conditioner-ir.svg, dark-invert
 
     EMC2101, components/emc2101, emc2101.jpg
-    MicroNova pellet stove, components/micronova, pellet.svg
+    MicroNova pellet stove, components/micronova, micronova.svg
     XGZP68xx Series, components/sensor/xgzp68xx, 6897d.jpg
 
 Text Components