Bump version to 2024.9.0b1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/bump-version.yml

@@ -15,45 +15,47 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-    - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.7
-    - uses: actions/setup-python@v4.8.0
+      - uses: actions/setup-python@v5.1.1
-      with:
+        with:
-        python-version: '3.11'
+          python-version: "3.11"
-    - run: pip install -r script/requirements.txt
+      - run: pip install -r script/requirements.txt
-    - run: script/bump-version.py ${{ github.event.inputs.version }}
+      - run: script/bump-version.py ${{ github.event.inputs.version }}
-    - name: Write Beta changelog
+      - name: Write Beta changelog
-      run: |
+        if: ${{ !contains(github.event.inputs.version, 'dev') }}
-        cat > esphome-beta/CHANGELOG.md << 'EOF'
+        run: |
-        ## ${{ github.event.inputs.version }}
+          cat > esphome-beta/CHANGELOG.md << 'EOF'
+          ## ${{ github.event.inputs.version }}
 
-        ${{ github.event.inputs.content }}
+          ${{ github.event.inputs.content }}
-        EOF
+          EOF
-    - name: Write Stable changelog
+      - name: Write Stable changelog
-      if: ${{ !contains(github.event.inputs.version, 'b') }}
+        if: ${{ !contains(github.event.inputs.version, 'b') && !contains(github.event.inputs.version, 'dev')  }}
-      run: |
+        run: |
-        cat > esphome/CHANGELOG.md << 'EOF'
+          cat > esphome/CHANGELOG.md << 'EOF'
-        ## ${{ github.event.inputs.version }}
+          ## ${{ github.event.inputs.version }}
 
-        ${{ github.event.inputs.content }}
+          ${{ github.event.inputs.content }}
-        EOF
+          EOF
-    - name: Commit version bump
+      - name: Commit version bump
-      id: commit_version
+        id: commit_version
-      run: |
+        run: |
-        git config user.name esphomebot
+          git config user.name esphomebot
-        git config user.email esphome@nabucasa.com
+          git config user.email esphome@nabucasa.com
-        git add .
+          git add .
-        git commit -m "Bump version to ${{ github.event.inputs.version }}"
+          git commit -m "Bump version to ${{ github.event.inputs.version }}"
-        git push
+          git push
-        COMMIT=$(git rev-parse HEAD)
+          COMMIT=$(git rev-parse HEAD)
-        echo "::set-output name=commit_sha::${COMMIT}"
+          echo "::set-output name=commit_sha::${COMMIT}"
-    - name: Create a Release
+      - name: Create a Release
-      uses: actions/create-release@v1.1.4
+        uses: actions/create-release@v1.1.4
-      continue-on-error: true
+        continue-on-error: true
-      env:
+        if: ${{ !contains(github.event.inputs.version, 'dev') }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        env:
-      with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        tag_name: ${{ github.event.inputs.version }}
+        with:
-        release_name: ${{ github.event.inputs.version }}
+          tag_name: ${{ github.event.inputs.version }}
-        body: ${{ github.event.inputs.content }}
+          release_name: ${{ github.event.inputs.version }}
-        prerelease: ${{ contains(github.event.inputs.version, 'b') }}
+          body: ${{ github.event.inputs.content }}
-        commitish: ${{ steps.commit_version.outputs.commit_sha }}
+          prerelease: ${{ contains(github.event.inputs.version, 'b') }}
+          commitish: ${{ steps.commit_version.outputs.commit_sha }}

.github/workflows/devcontainer-build.yaml

@@ -19,20 +19,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.7
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.2.0
         if: github.event_name != 'pull_request'
         with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
             password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.1.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.4.0
       - name: Build and Push
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v6.4.1
         with:
           context: .
           file: .devcontainer/Dockerfile

.github/workflows/lint.yml

@@ -19,9 +19,9 @@ jobs:
             channel: dev
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.7
       - name: 🛠 Setup Python
-        uses: actions/setup-python@v4.8.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: '3.11'
       - name: 🛠 Install dependencies
@@ -29,6 +29,6 @@ jobs:
       - name: 🛠 Generate files from template
         run: python script/generate.py ${{ matrix.channels.channel }}
       - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channels.channel }}
-        uses: frenck/action-addon-linter@v2.15.0
+        uses: frenck/action-addon-linter@v2.15.1
         with:
           path: "./${{ matrix.channels.folder }}"

esphome-beta/CHANGELOG.md

@@ -1,7 +1,88 @@
-## 2024.3.0b2
+## 2024.9.0b1
 
-- SPI: Revert clk_pin to standard output pin schema [esphome#6368](https://github.com/esphome/esphome/pull/6368) by [@clydebarrow](https://github.com/clydebarrow)
+- [code-quality] fix performance-unnecessary-value-param [esphome#7274](https://github.com/esphome/esphome/pull/7274) by [@tomaszduda23](https://github.com/tomaszduda23)
-- Allow actions in web_server to be executed via GET method [esphome#5938](https://github.com/esphome/esphome/pull/5938) by [@afarago](https://github.com/afarago)
+- [code-quality] fix clang-tidy prometheus [esphome#7284](https://github.com/esphome/esphome/pull/7284) by [@tomaszduda23](https://github.com/tomaszduda23)
-- fix servo restore [esphome#6370](https://github.com/esphome/esphome/pull/6370) by [@ssieb](https://github.com/ssieb)
+- [code-quality] fix clang-tidy ota [esphome#7282](https://github.com/esphome/esphome/pull/7282) by [@tomaszduda23](https://github.com/tomaszduda23)
-- Don't try to get IPv6 addresses when disabled [esphome#6366](https://github.com/esphome/esphome/pull/6366) by [@HeMan](https://github.com/HeMan)
+- [code-quality] fix clang-tidy e131 [esphome#7281](https://github.com/esphome/esphome/pull/7281) by [@tomaszduda23](https://github.com/tomaszduda23)
+- [code-quality] fix clang-tidy wireguard [esphome#7287](https://github.com/esphome/esphome/pull/7287) by [@tomaszduda23](https://github.com/tomaszduda23)
+- [code-quality] fix clang-tidy improv_serial [esphome#7283](https://github.com/esphome/esphome/pull/7283) by [@tomaszduda23](https://github.com/tomaszduda23)
+- [code-quality] fix clang-tidy captive_portal [esphome#7280](https://github.com/esphome/esphome/pull/7280) by [@tomaszduda23](https://github.com/tomaszduda23)
+- Add HMAC-MD5 support for authenticating OTA updates [esphome#7200](https://github.com/esphome/esphome/pull/7200) by [@dwmw2](https://github.com/dwmw2) (new-integration)
+- [const] Add UNIT_LITRE [esphome#7317](https://github.com/esphome/esphome/pull/7317) by [@Roving-Ronin](https://github.com/Roving-Ronin)
+- [code-quality] fix clang-tidy socket [esphome#7285](https://github.com/esphome/esphome/pull/7285) by [@tomaszduda23](https://github.com/tomaszduda23)
+- [code-quality] fix clang-tidy cstddef [esphome#7324](https://github.com/esphome/esphome/pull/7324) by [@tomaszduda23](https://github.com/tomaszduda23)
+- Add output source priority "hybrid" [esphome#7322](https://github.com/esphome/esphome/pull/7322) by [@syssi](https://github.com/syssi)
+- Enable verbose mode from env ESPHOME_VERBOSE or --verbose [esphome#6987](https://github.com/esphome/esphome/pull/6987) by [@ptr727](https://github.com/ptr727)
+- Tuya Number: allow to set hidden datapoints [esphome#7024](https://github.com/esphome/esphome/pull/7024) by [@szupi-ipuzs](https://github.com/szupi-ipuzs)
+- feat: Expand ByteBuffer [esphome#7316](https://github.com/esphome/esphome/pull/7316) by [@Rapsssito](https://github.com/Rapsssito)
+- [ledc] Tweak fix in #6997 [esphome#7336](https://github.com/esphome/esphome/pull/7336) by [@kbx81](https://github.com/kbx81)
+- [ledc] Fix maximum brightness on ESP-IDF 5.1 [esphome#7342](https://github.com/esphome/esphome/pull/7342) by [@clydebarrow](https://github.com/clydebarrow)
+- [lvgl] Bug fixes: [esphome#7341](https://github.com/esphome/esphome/pull/7341) by [@clydebarrow](https://github.com/clydebarrow)
+- [const] Move ``CONF_LINE_FREQUENCY`` to const.py [esphome#7351](https://github.com/esphome/esphome/pull/7351) by [@jesserockz](https://github.com/jesserockz)
+- bl0942: Fix init sequence, add address and line_frequency options [esphome#7250](https://github.com/esphome/esphome/pull/7250) by [@dwmw2](https://github.com/dwmw2)
+- Add supported formats to media player [esphome#7318](https://github.com/esphome/esphome/pull/7318) by [@synesthesiam](https://github.com/synesthesiam)
+- Add reset to esp32_rmt_led_strip [esphome#7354](https://github.com/esphome/esphome/pull/7354) by [@angelnu](https://github.com/angelnu)
+- [ili9xxx] Make `invert_colors` required [esphome#7292](https://github.com/esphome/esphome/pull/7292) by [@gvdhoven](https://github.com/gvdhoven) (breaking-change)
+- Add WS2811 to esp32_rmt_led_strip [esphome#7353](https://github.com/esphome/esphome/pull/7353) by [@angelnu](https://github.com/angelnu)
+- [lvgl] Add lvgl.widget.focus action and related triggers. [esphome#7315](https://github.com/esphome/esphome/pull/7315) by [@clydebarrow](https://github.com/clydebarrow)
+- esp32_can: suppress compiler warning [esphome#7372](https://github.com/esphome/esphome/pull/7372) by [@mrk-its](https://github.com/mrk-its)
+- Add support for BL0906 energy meter [esphome#7339](https://github.com/esphome/esphome/pull/7339) by [@tarontop](https://github.com/tarontop) (new-integration)
+- [platformio] Add environments for ESP-IDF 5.3 for development [esphome#7371](https://github.com/esphome/esphome/pull/7371) by [@clydebarrow](https://github.com/clydebarrow)
+- [lvgl] Bug fixes [esphome#7370](https://github.com/esphome/esphome/pull/7370) by [@clydebarrow](https://github.com/clydebarrow)
+- [bytebuffer] Use existing bit_cast operations. [esphome#7374](https://github.com/esphome/esphome/pull/7374) by [@clydebarrow](https://github.com/clydebarrow)
+- Bump actions/setup-python from 5.1.0 to 5.2.0 [esphome#7375](https://github.com/esphome/esphome/pull/7375) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump actions/setup-python from 5.1.1 to 5.2.0 in /.github/actions/restore-python [esphome#7376](https://github.com/esphome/esphome/pull/7376) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- [gt911] Add  reset pin config [esphome#7373](https://github.com/esphome/esphome/pull/7373) by [@clydebarrow](https://github.com/clydebarrow)
+- [st7701s] Add delay feature in init sequences [esphome#7343](https://github.com/esphome/esphome/pull/7343) by [@clydebarrow](https://github.com/clydebarrow)
+- Add now required `invert_colors` option to test files referencing ili9xxx [esphome#7367](https://github.com/esphome/esphome/pull/7367) by [@clydebarrow](https://github.com/clydebarrow)
+- esp32_can: make queue lengths configurable [esphome#7361](https://github.com/esphome/esphome/pull/7361) by [@mrk-its](https://github.com/mrk-its)
+- [code-quality] fix clang-tidy web_server and web_server_base [esphome#7286](https://github.com/esphome/esphome/pull/7286) by [@tomaszduda23](https://github.com/tomaszduda23)
+- Update MiCS Values [esphome#7173](https://github.com/esphome/esphome/pull/7173) by [@TrevorSchirmer](https://github.com/TrevorSchirmer)
+- Tuya Number: allow restoring value of hidden datapoints [esphome#7346](https://github.com/esphome/esphome/pull/7346) by [@szupi-ipuzs](https://github.com/szupi-ipuzs)
+- [udp] Implement UDP sensor broadcast [esphome#6865](https://github.com/esphome/esphome/pull/6865) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- update logs for bluetooth proxy [esphome#7382](https://github.com/esphome/esphome/pull/7382) by [@tomaszduda23](https://github.com/tomaszduda23)
+- [font] Make display an auto-load, not a dependency [esphome#7366](https://github.com/esphome/esphome/pull/7366) by [@clydebarrow](https://github.com/clydebarrow)
+- CH422G support [esphome#7356](https://github.com/esphome/esphome/pull/7356) by [@jesterret](https://github.com/jesterret) (new-integration)
+- [rpi_dpi_rgb] Add enable_pin and reset_display method to driver [esphome#7383](https://github.com/esphome/esphome/pull/7383) by [@lboue](https://github.com/lboue)
+- Bump actions/upload-artifact from 4.3.4 to 4.4.0 [esphome#7379](https://github.com/esphome/esphome/pull/7379) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Fix build for esp32h2 using esp-idf 5.3 [esphome#7393](https://github.com/esphome/esphome/pull/7393) by [@mrene](https://github.com/mrene)
+- Bump mDNS and follow ruff's suggestions [esphome#7308](https://github.com/esphome/esphome/pull/7308) by [@HeMan](https://github.com/HeMan)
+- Bump rp2040 Arduino platform and framework [esphome#7134](https://github.com/esphome/esphome/pull/7134) by [@HeMan](https://github.com/HeMan)
+- [gree] Add support for YX1FF remote [esphome#7298](https://github.com/esphome/esphome/pull/7298) by [@dangreco](https://github.com/dangreco)
+- [modbus_controller] Allow duplicate command config [esphome#7311](https://github.com/esphome/esphome/pull/7311) by [@0x3333](https://github.com/0x3333)
+- Better support for task blocking ring buffer reads and writes [esphome#7390](https://github.com/esphome/esphome/pull/7390) by [@kahrendt](https://github.com/kahrendt)
+- Bump pypa/gh-action-pypi-publish from 1.9.0 to 1.10.0 [esphome#7395](https://github.com/esphome/esphome/pull/7395) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- [api] Remove id from ``MediaPlayerSupportedFormat`` [esphome#7406](https://github.com/esphome/esphome/pull/7406) by [@jesserockz](https://github.com/jesserockz)
+- Drop max BLE client connections limitation [esphome#7088](https://github.com/esphome/esphome/pull/7088) by [@syssi](https://github.com/syssi)
+- [bl0942] loop and overflow cleanup [esphome#7358](https://github.com/esphome/esphome/pull/7358) by [@dwmw2](https://github.com/dwmw2)
+- Bump peter-evans/create-pull-request from 6.1.0 to 7.0.0 [esphome#7405](https://github.com/esphome/esphome/pull/7405) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pypa/gh-action-pypi-publish from 1.10.0 to 1.10.1 [esphome#7404](https://github.com/esphome/esphome/pull/7404) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Voice assist improvement - configurable conversation_id timeout [esphome#7385](https://github.com/esphome/esphome/pull/7385) by [@jeffc](https://github.com/jeffc)
+- Support BL0942 calibration [esphome#7299](https://github.com/esphome/esphome/pull/7299) by [@dwmw2](https://github.com/dwmw2)
+- [micro_wake_word] Remove duplicated download code [esphome#7401](https://github.com/esphome/esphome/pull/7401) by [@jesserockz](https://github.com/jesserockz)
+- Add StatsD component [esphome#6642](https://github.com/esphome/esphome/pull/6642) by [@Links2004](https://github.com/Links2004) (new-integration)
+- [homeassistant-switch] Support different entity domains [esphome#7331](https://github.com/esphome/esphome/pull/7331) by [@jesserockz](https://github.com/jesserockz)
+- Add support for using BMP280 with SPI [esphome#7053](https://github.com/esphome/esphome/pull/7053) by [@ademuri](https://github.com/ademuri) (new-integration) (breaking-change)
+- Add voice assistant announce [esphome#7377](https://github.com/esphome/esphome/pull/7377) by [@synesthesiam](https://github.com/synesthesiam)
+- [lvgl] Msgbox fixes and enhancements [esphome#7380](https://github.com/esphome/esphome/pull/7380) by [@clydebarrow](https://github.com/clydebarrow)
+- libretiny: Allow specifying version of explicitly imported sources [esphome#7408](https://github.com/esphome/esphome/pull/7408) by [@dwmw2](https://github.com/dwmw2)
+- [libretiny] Report version 1.7.0 for 'dev' and 'latest' [esphome#7415](https://github.com/esphome/esphome/pull/7415) by [@dwmw2](https://github.com/dwmw2)
+- LTR-501, LTR-301, LTR-558 Series of Lite-On Light (ALS) and Proximity(PS) sensors [esphome#6262](https://github.com/esphome/esphome/pull/6262) by [@latonita](https://github.com/latonita) (new-integration)
+- Fix armv7 container builds [esphome#7426](https://github.com/esphome/esphome/pull/7426) by [@jesserockz](https://github.com/jesserockz)
+- [gh-actions] Don't produce docker build summaries [esphome#7430](https://github.com/esphome/esphome/pull/7430) by [@jesserockz](https://github.com/jesserockz)
+- Add BK72xx support to require_framework_version() [esphome#7409](https://github.com/esphome/esphome/pull/7409) by [@dwmw2](https://github.com/dwmw2)
+- Switch IPv6 platform check to use require_framework_version() [esphome#7410](https://github.com/esphome/esphome/pull/7410) by [@dwmw2](https://github.com/dwmw2)
+- [bl0942] Improve energy reporting [esphome#7428](https://github.com/esphome/esphome/pull/7428) by [@dwmw2](https://github.com/dwmw2)
+- [rpi_dpi_rgb] Add bounce_buffer config for ESP-IDF 5.x [esphome#7423](https://github.com/esphome/esphome/pull/7423) by [@clydebarrow](https://github.com/clydebarrow)
+- [LVGL] Add color gradients [esphome#7427](https://github.com/esphome/esphome/pull/7427) by [@clydebarrow](https://github.com/clydebarrow)
+- [dsmr] Add internal 'telegram' text_sensor to support bridging [esphome#6841](https://github.com/esphome/esphome/pull/6841) by [@marcovaneck](https://github.com/marcovaneck)
+- Pull in new AsyncTCP for IPv6 on BK72xx [esphome#7431](https://github.com/esphome/esphome/pull/7431) by [@dwmw2](https://github.com/dwmw2)
+- Bump LibreTiny recommended version to 1.7.0 [esphome#7432](https://github.com/esphome/esphome/pull/7432) by [@dwmw2](https://github.com/dwmw2)
+- Enable IPv6 support for BK72xx [esphome#7398](https://github.com/esphome/esphome/pull/7398) by [@dwmw2](https://github.com/dwmw2)
+- Move I2S config settings the the base i2sAudio files. Phase 1 [esphome#7183](https://github.com/esphome/esphome/pull/7183) by [@nielsnl68](https://github.com/nielsnl68) (breaking-change)
+- Implement all supported thermocouple types for MAX31856 [esphome#7218](https://github.com/esphome/esphome/pull/7218) by [@ArkanStasarik](https://github.com/ArkanStasarik)
+- [i2s_audio] Add more options to speakers and microphones [esphome#7306](https://github.com/esphome/esphome/pull/7306) by [@pyos](https://github.com/pyos) (breaking-change)
+- [uponor_smatrix] Modifies sending algorithm [esphome#7326](https://github.com/esphome/esphome/pull/7326) by [@skasi7](https://github.com/skasi7)
+- User configurable frame buffer. [esphome#7360](https://github.com/esphome/esphome/pull/7360) by [@ajwahab](https://github.com/ajwahab)
+- [Modbus Controller] Added preference to change command retries [esphome#7312](https://github.com/esphome/esphome/pull/7312) by [@0x3333](https://github.com/0x3333)
 

esphome-beta/config.yaml

@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome (beta)
-version: 2024.3.0b2
+version: 2024.9.0b1
 slug: esphome-beta
 description: Beta version of ESPHome add-on
 image: ghcr.io/esphome/esphome-hassio

esphome-dev/CHANGELOG.md

@@ -1 +1 @@
-See https://esphome.io/changelog/index.html
+See https://github.com/esphome/esphome/commits/dev

esphome-dev/Dockerfile

@@ -1,10 +0,0 @@
-ARG BUILD_FROM=esphome/esphome-hassio-amd64:dev
-FROM ${BUILD_FROM}
-
-# Copy root filesystem
-COPY rootfs /
-
-# Labels
-LABEL \
-    io.hass.type="addon" \
-    io.hass.version=dev

esphome-dev/build.yaml

@@ -1,5 +0,0 @@
----
-build_from:
-  aarch64: ghcr.io/esphome/esphome-hassio:dev
-  amd64: ghcr.io/esphome/esphome-hassio:dev
-  armv7: ghcr.io/esphome/esphome-hassio:dev

esphome-dev/config.yaml

@@ -33,9 +33,10 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome (dev)
-version: dev
+version: 2024.9.0-dev20240911
 slug: esphome-dev
 description: Development version of ESPHome add-on
+image: ghcr.io/esphome/esphome-hassio
 stage: experimental
 advanced: true
 options:

esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh

@@ -1,47 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files installs the user ESPHome fork if specified
-# The fork must be up to date with the latest ESPHome dev branch
-# and have no conflicts
-# ==============================================================================
-
-declare esphome_fork
-
-if bashio::config.has_value 'esphome_fork'; then
-    esphome_fork=$(bashio::config 'esphome_fork')
-    if [[ $esphome_fork == *":"* ]]; then
-      IFS=':' read -r -a array <<< "$esphome_fork"
-      username=${array[0]}
-      ref=${array[1]}
-    else
-      username="esphome"
-      ref=$esphome_fork
-    fi
-    full_url="https://github.com/${username}/esphome/archive/${ref}.tar.gz"
-    bashio::log.info "Checking forked ESPHome"
-    dev_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
-    bashio::log.info "Downloading ESPHome from fork '${esphome_fork}' (${full_url})..."
-    curl -L -o /tmp/esphome.tar.gz "${full_url}" -qq \
-      || bashio::exit.nok "Failed downloading ESPHome fork."
-    bashio::log.info "Installing ESPHome from fork '${esphome_fork}' (${full_url})..."
-    rm -rf /esphome || bashio::exit.nok "Failed to remove ESPHome."
-    mkdir /esphome
-    tar -zxf /tmp/esphome.tar.gz -C /esphome --strip-components=1 \
-      || bashio::exit.nok "Failed installing ESPHome from fork."
-    pip install -U -e /esphome || bashio::exit.nok "Failed installing ESPHome from fork."
-    rm -f /tmp/esphome.tar.gz
-    fork_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
-
-    if [[ "$fork_version" != "$dev_version" ]]; then
-      bashio::log.error "############################"
-      bashio::log.error "Uninstalled fork as version does not match"
-      bashio::log.error "Update (or ask the author to update) the branch"
-      bashio::log.error "This is important as the dev addon and the dev ESPHome"
-      bashio::log.error "branch can have changes that are not compatible with old forks"
-      bashio::log.error "and get reported as bugs which we cannot solve easily."
-      bashio::log.error "############################"
-      bashio::exit.nok
-    fi
-    bashio::log.info "Installed ESPHome from fork '${esphome_fork}' (${full_url})..."
-fi

esphome/CHANGELOG.md

@@ -1,8 +1,7 @@
-## 2024.2.2
+## 2024.8.3
 
-- CSE7766: Fix energy calculation [esphome#6286](https://github.com/esphome/esphome/pull/6286) by [@puuu](https://github.com/puuu)
+- [datetime] Fix templated args [esphome#7368](https://github.com/esphome/esphome/pull/7368) by [@jesserockz](https://github.com/jesserockz)
-- handling with the negative temperature in the sensor tmp102 [esphome#6316](https://github.com/esphome/esphome/pull/6316) by [@FlyingFeng2021](https://github.com/FlyingFeng2021)
+- Bump Dockerfile dependencies [esphome#7386](https://github.com/esphome/esphome/pull/7386) by [@jesserockz](https://github.com/jesserockz)
-- fix tmp102 negative calculation [esphome#6320](https://github.com/esphome/esphome/pull/6320) by [@ssieb](https://github.com/ssieb)
+- Enable IPv6 when manual IPv4 is enabled [esphome#7381](https://github.com/esphome/esphome/pull/7381) by [@HeMan](https://github.com/HeMan)
-- auto load output for now [esphome#6309](https://github.com/esphome/esphome/pull/6309) by [@ssieb](https://github.com/ssieb)
+- [core] Only clean build files with esp-idf [esphome#7388](https://github.com/esphome/esphome/pull/7388) by [@jesserockz](https://github.com/jesserockz)
-- Add wake word phrase to voice assistant start command [esphome#6290](https://github.com/esphome/esphome/pull/6290) by [@jesserockz](https://github.com/jesserockz)
 

esphome/config.yaml

@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome
-version: 2024.2.2
+version: 2024.8.3
 slug: esphome
 description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
 image: ghcr.io/esphome/esphome-hassio

script/bump-version.py

@@ -2,7 +2,6 @@
 
 import argparse
 import re
-import subprocess
 from dataclasses import dataclass
 import sys
 import os
@@ -17,72 +16,71 @@ class Version:
     minor: int
     patch: int
     beta: int = 0
-    dev: bool = False
+    dev: str = ""
 
     def __str__(self):
-        return f'{self.major}.{self.minor}.{self.full_patch}'
+        return f"{self.major}.{self.minor}.{self.full_patch}"
 
     @property
     def full_patch(self):
-        res = f'{self.patch}'
+        res = f"{self.patch}"
         if self.beta > 0:
-            res += f'b{self.beta}'
+            res += f"b{self.beta}"
         if self.dev:
-            res += '-dev'
+            res += f"-dev{self.dev}"
         return res
 
     @classmethod
     def parse(cls, value):
-        match = re.match(r'(\d+).(\d+).(\d+)(b\d+)?(-dev)?', value)
+        match = re.match(r"(\d+).(\d+).(\d+)(b\d+)?(-dev\d+)?", value)
         assert match is not None
         major = int(match[1])
         minor = int(match[2])
         patch = int(match[3])
         beta = int(match[4][1:]) if match[4] else 0
-        dev = bool(match[5])
+        dev = str(match[5][4:]) if match[5] else ""
-        return Version(
+        return Version(major=major, minor=minor, patch=patch, beta=beta, dev=dev)
-            major=major, minor=minor, patch=patch,
-            beta=beta, dev=dev
-        )
 
 
-def sub(path, pattern, repl, expected_count=1):
+def _sub(path, pattern, repl, expected_count=1):
-    with open(path) as fh:
+    with open(path, encoding="utf-8") as fh:
         content = fh.read()
-    content, count = re.subn(pattern, repl, content, flags=re.MULTILINE)
+    content, count = re.subn(pattern, repl, content, flags=re.NOFLAG)
     if expected_count is not None:
         assert count == expected_count, f"Pattern {pattern} replacement failed!"
-    with open(path, "wt") as fh:
+    with open(path, "wt", encoding="utf-8") as fh:
         fh.write(content)
 
 
-def write_version(target: str, version: Version):
+def _write_version(target: str, version: Version):
-    #  version: '1.14.5'  # BETA
+    #  version: "2024.5.0-dev20240412"  # DEV
-    #  version: '1.14.5'  # STABLE
+    #  version: "1.14.5"  # BETA
-    sub(
+    #  version: "1.14.5"  # STABLE
-        'template/addon_config.yaml',
+    _sub(
-        r"  version: '[^']+'  # {}".format(target.upper()),
+        "template/addon_config.yaml",
-        f"  version: '{version}'  # {target.upper()}"
+        f'  version: "[^"]+"  # {target.upper()}',
+        f'  version: "{version}"  # {target.upper()}',
     )
 
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('new_version', type=str)
+    parser.add_argument("new_version", type=str)
     args = parser.parse_args()
 
     version = Version.parse(args.new_version)
-    assert not version.dev
 
     print(f"Bumping to {version}")
-    if version.beta:
+    if version.dev:
-        write_version('beta', version)
+        _write_version("dev", version)
-        generate.main(['beta'])
+        generate.main(["dev"])
+    elif version.beta:
+        _write_version("beta", version)
+        generate.main(["beta"])
     else:
-        assert not version.beta
+        _write_version("stable", version)
-        write_version('stable', version)
+        _write_version("beta", version)
-        write_version('beta', version)
+        generate.main(["stable", "beta"])
-        generate.main(['stable', 'beta'])
     return 0
 
 

script/generate.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 
 import argparse
-import yaml
 from pathlib import Path
 from enum import Enum
 from shutil import copyfile
 import sys
 import os
 
+import yaml
+
 
 class Channel(Enum):
     stable = "stable"
@@ -25,17 +26,16 @@ def main(args):
     root = Path(__file__).parent.parent
     templ = root / "template"
 
-    with open(templ / "addon_config.yaml", "r") as f:
+    with open(templ / "addon_config.yaml", "r", encoding="utf-8") as f:
         config = yaml.safe_load(f)
 
     copyf = config["copy_files"]
 
     for channel in args.channels:
         conf = config[f"esphome-{channel.value}"]
-        base_image = conf.pop("base_image", None)
         dir_ = root / conf.pop("directory")
         path = dir_ / "config.yaml"
-        with open(path, "w") as f:
+        with open(path, "w", encoding="utf-8") as f:
             yaml.dump(conf, f, indent=2, sort_keys=False, explicit_start=True)
 
         for file_ in copyf:
@@ -46,19 +46,9 @@ def main(args):
                 copyfile(templ / file_, dir_ / file_)
 
         path = dir_ / "FILES ARE GENERATED DO NOT EDIT"
-        with open(path, "w") as f:
+        with open(path, "w", encoding="utf-8") as f:
             f.write("Any edits should be made to the files in the 'template' directory")
 
-        if channel == Channel.dev:
-            path = dir_ / "build.yaml"
-            build_conf = {
-                "build_from": {
-                    arch: base_image for arch in conf["arch"]
-                }
-            }
-            with open(path, "w") as f:
-                yaml.dump(build_conf, f, indent=2, sort_keys=True, explicit_start=True)
-
 
 if __name__ == "__main__":
     main(sys.argv[1:])

template/addon_config.yaml

@@ -16,11 +16,11 @@ base: &base
   # Ingress settings
   ingress: true
   ingress_port: 0
-  panel_icon: 'mdi:chip'
+  panel_icon: "mdi:chip"
   # Automatically add UART devices to add-on
   uart: true
   ports:
-    '6052/tcp': null
+    "6052/tcp": null
   map:
     - ssl:ro
     - config:rw
@@ -46,10 +46,11 @@ esphome-dev:
   <<: *base
   directory: esphome-dev
   name: ESPHome (dev)
-  version: 'dev'  # DEV
+  version: "2024.9.0-dev20240911"  # DEV
   slug: esphome-dev
   description: "Development version of ESPHome add-on"
   url: https://next.esphome.io/
+  image: ghcr.io/esphome/esphome-hassio
   stage: experimental
   advanced: true
   schema:
@@ -62,15 +63,14 @@ esphome-dev:
     certfile: str?
     keyfile: str?
     leave_front_door_open: bool?
-  base_image: ghcr.io/esphome/esphome-hassio:dev
   options:
-      home_assistant_dashboard_integration: false
+    home_assistant_dashboard_integration: false
 
 esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '2024.3.0b2'  # BETA
+  version: "2024.9.0b1"  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
@@ -78,13 +78,13 @@ esphome-beta:
   stage: experimental
   advanced: true
   options:
-      home_assistant_dashboard_integration: false
+    home_assistant_dashboard_integration: false
 
 esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '2024.2.2'  # STABLE
+  version: "2024.8.3"  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio