Merge pull request #5111 from esphome/bump-2025.7.1

2025.7.1

Author: jesserockz

Makefile

@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2025.7.0
+ESPHOME_REF = 2025.7.1
 PAGEFIND_VERSION=1.1.1
 PAGEFIND=pagefind
 NET_PAGEFIND=../pagefindbin/pagefind

_static/version

@@ -1 +1 @@
-2025.7.0
+2025.7.1

changelog/2025.7.0.rst

@@ -391,6 +391,21 @@ to update your code.
 For detailed migration information, see the `ArduinoJson migration guide <https://arduinojson.org/v7/how-to/upgrade-from-v6/>`__.
 
 
+Release 2025.7.1 - July 17
+--------------------------
+
+.. collapse:: Show
+    :open:
+
+    - [lvgl]: fix missing await keyword in meter tick_style width processing :esphomepr:`9538` by :ghuser:`theshut`
+    - Fix compilation error when using string lambdas with homeassistant services :esphomepr:`9543` by :ghuser:`bdraco`
+    - Fix format string warnings in Web Server OTA component :esphomepr:`9569` by :ghuser:`bdraco`
+    - Add helpful error message when ESP32+Arduino runs out of flash space :esphomepr:`9580` by :ghuser:`bdraco`
+    - Allow disabling OTA for web_server while keeping it enabled for captive_portal :esphomepr:`9583` by :ghuser:`bdraco`
+    - [esp32] Add missing include for helpers :esphomepr:`9579` by :ghuser:`jesserockz`
+    - Fix lwIP thread safety assertion failures on ESP32 :esphomepr:`9570` by :ghuser:`bdraco`
+
+
 Full list of changes
 --------------------
 

components/web_server.rst

@@ -67,6 +67,11 @@ Configuration variables:
   `Private Network Access Permission Prompt <https://wicg.github.io/private-network-access/#permission-prompt>`__.
   Defaults to ``true``.
 - **log** (*Optional*, boolean): Turn on or off the log feature inside webserver. Defaults to ``true``.
+- **ota** (*Optional*, boolean): Explicitly disable OTA updates through the web server interface. Only accepts ``false``. 
+  This option is typically used when you have both ``web_server`` and ``captive_portal`` configured, and you want
+  OTA updates to be available only through the captive portal. Since ``captive_portal`` automatically loads the 
+  web server OTA platform, setting this to ``false`` prevents OTA access through the regular web interface while
+  maintaining it for captive portal access. To enable OTA for web server, use the ``web_server`` OTA platform instead.
 - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
 - **local** (*Optional*, boolean): Include supporting javascript locally allowing it to work without internet access. Defaults to ``false``.
 - **version** (*Optional*, string): ``1``, ``2`` or ``3``. Version 1 displays as a table. Version 2 uses web components and has more functionality. Version 3 uses HA-Styling. Defaults to ``2``.
@@ -85,6 +90,7 @@ interface are hosted by esphome.io. If you want to use your own service, use the
     **OTA Updates via Web Interface**
 
     The ``ota`` option has been moved from the ``web_server`` component to its own OTA platform.
+    
     To enable OTA updates through the web interface, use the new ``web_server`` OTA platform:
 
     .. code-block:: yaml
@@ -93,6 +99,18 @@ interface are hosted by esphome.io. If you want to use your own service, use the
         ota:
           - platform: web_server
 
+    To explicitly disable OTA updates for the web server while keeping them enabled for captive portal 
+    (useful when captive portal is configured since it automatically enables web server OTA):
+
+    .. code-block:: yaml
+
+        # Disable OTA updates for web_server only
+        # Captive portal will still have OTA access since it auto-loads the web server OTA platform
+        web_server:
+          ota: false
+        
+        captive_portal:  # This component automatically enables OTA
+
     See :doc:`/components/ota/web_server` for more information.
 
 Example configurations:
@@ -126,6 +144,19 @@ No internet/intranet required on the clients (all assets are inlined, compressed
     web_server:
       local: true
 
+Disabling OTA updates for web server while using captive portal (common security setup):
+
+.. code-block:: yaml
+
+    # Example configuration entry
+    web_server:
+      port: 80
+      ota: false  # Disables OTA through regular web interface
+    
+    # Captive portal automatically enables web server OTA platform
+    # OTA will only be accessible when captive portal is active
+    captive_portal:
+
 
 Advanced usage
 --------------

conf.py

@@ -73,7 +73,7 @@
 # The short X.Y version.
 version = "2025.7"
 # The full version, including alpha/beta/rc tags.
-release = "2025.7.0"
+release = "2025.7.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

guides/supporters.rst

@@ -263,6 +263,7 @@ Contributors
 - `Blake (@bmatheny) <https://github.com/bmatheny>`__
 - `Bruno Medici (@bmedici) <https://github.com/bmedici>`__
 - `Bob (@Bmooij) <https://github.com/Bmooij>`__
+- `Bjørn Mork (@bmork) <https://github.com/bmork>`__
 - `Benjamin Klotz (@bnw) <https://github.com/bnw>`__
 - `Bob Kersten (@bobkersten) <https://github.com/bobkersten>`__
 - `Bodmer (@Bodmer) <https://github.com/Bodmer>`__
@@ -1336,6 +1337,7 @@ Contributors
 - `Midbin (@Midbin) <https://github.com/Midbin>`__
 - `Pauline Middelink (@middelink) <https://github.com/middelink>`__
 - `Joel Midstjärna (@midstar) <https://github.com/midstar>`__
+- `Big Mike (@mikelawrence) <https://github.com/mikelawrence>`__
 - `Mike_Went (@MikeWent) <https://github.com/MikeWent>`__
 - `Mikko Tervala (@MikkoTervala) <https://github.com/MikkoTervala>`__
 - `mikosoft83 (@mikosoft83) <https://github.com/mikosoft83>`__
@@ -2181,4 +2183,4 @@ Contributors
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 - `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__
 
-*This page was last updated July 16, 2025.*
+*This page was last updated July 17, 2025.*