From 804eb79e28b00fb1d053c55cbe2d75e3f5f46241 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:45:32 +1200 Subject: [PATCH 1/3] Bump version to 2024.6.5 --- Doxygen | 2 +- Makefile | 2 +- _static/version | 2 +- conf.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doxygen b/Doxygen index 8af1ec645..dfbde1a0e 100644 --- a/Doxygen +++ b/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.6.4 +PROJECT_NUMBER = 2024.6.5 # 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 diff --git a/Makefile b/Makefile index 40b348506..80936929c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ESPHOME_PATH = ../esphome -ESPHOME_REF = 2024.6.4 +ESPHOME_REF = 2024.6.5 PAGEFIND_VERSION=1.1.0 PAGEFIND=pagefind NET_PAGEFIND=../pagefindbin/pagefind diff --git a/_static/version b/_static/version index ca26d9ada..f5e12de82 100644 --- a/_static/version +++ b/_static/version @@ -1 +1 @@ -2024.6.4 \ No newline at end of file +2024.6.5 \ No newline at end of file diff --git a/conf.py b/conf.py index e4ff6f124..01ce02d8e 100644 --- a/conf.py +++ b/conf.py @@ -69,7 +69,7 @@ author = "ESPHome" # The short X.Y version. version = "2024.6" # The full version, including alpha/beta/rc tags. -release = "2024.6.4" +release = "2024.6.5" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 68c97b27a018bb39fe4f018a6cef0df0a4dcaa2c Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:46:06 +1200 Subject: [PATCH 2/3] Update changelog for 2024.6.5 --- changelog/2024.6.0.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changelog/2024.6.0.rst b/changelog/2024.6.0.rst index 39d085637..2d6f3ec7a 100644 --- a/changelog/2024.6.0.rst +++ b/changelog/2024.6.0.rst @@ -219,6 +219,13 @@ Release 2024.6.4 - June 27 - [ota-esphome] Merge configurations by port :esphomepr:`7001` by :ghuser:`kbx81` - Fix LEDC 100% is not 100% duty with ESP32 IDF :esphomepr:`6997` by :ghuser:`Links2004` +Release 2024.6.5 - July 3 +------------------------- + +- [mpr121] await register parented :esphomepr:`7014` by :ghuser:`jesserockz` +- Move some consts for #4585 :esphomepr:`7023` by :ghuser:`kbx81` +- [wifi] Only set default ttls phase 2 on esp-idf :esphomepr:`7033` by :ghuser:`jesserockz` + Full list of changes -------------------- From c2df792c9fcfda2038c47d45c586738b697bb9d5 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:46:45 +1200 Subject: [PATCH 3/3] Update supporters for 2024.6.5 --- guides/supporters.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guides/supporters.rst b/guides/supporters.rst index 35f96e4ca..dc3a00317 100644 --- a/guides/supporters.rst +++ b/guides/supporters.rst @@ -1032,6 +1032,7 @@ Contributors - `Joakim Sørensen (@ludeeus) `__ - `ludrao (@ludrao) `__ - `Luiz Correia (@luizcorreia) `__ +- `luk1803 (@luk1803) `__ - `luka6000 (@luka6000) `__ - `Lukas Klass (@LukasK13) `__ - `Lukas Lindner (@lukasl96) `__ @@ -1244,6 +1245,7 @@ Contributors - `NatashaLi-ESPRESSIF (@NatashaLi-ESPRESSIF) `__ - `Nate Lust (@natelust) `__ - `Nathan Marlor (@nathanmarlor) `__ +- `Andreas Fritiofson (@nattgris) `__ - `ueno (@nayuta-ueno) `__ - `Nazar Mokrynskyi (@nazar-pc) `__ - `Bergont Nicolas (@nbergont) `__ @@ -1890,4 +1892,4 @@ Contributors - `Christian Zufferey (@zuzu59) `__ - `Zynth-dev (@Zynth-dev) `__ -*This page was last updated June 27, 2024.* +*This page was last updated July 3, 2024.*