From ef022e79c18cf055227b70b070e4bd30c308fe34 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:21:36 +1300
Subject: [PATCH 1/2] Add optional minimum esphome version to microWakeWord
 manifest

---
 esphome/components/micro_wake_word/__init__.py |  4 ++++
 esphome/config_validation.py                   | 11 +++++++++++
 esphome/core/config.py                         | 12 +-----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/esphome/components/micro_wake_word/__init__.py b/esphome/components/micro_wake_word/__init__.py
index 38202bdfb949..b33a8a01d652 100644
--- a/esphome/components/micro_wake_word/__init__.py
+++ b/esphome/components/micro_wake_word/__init__.py
@@ -103,6 +103,7 @@ def _process_git_source(config):
 KEY_WEBSITE = "website"
 KEY_VERSION = "version"
 KEY_MICRO = "micro"
+KEY_MINIMUM_ESPHOME_VERSION = "minimum_esphome_version"
 
 MANIFEST_SCHEMA_V1 = cv.Schema(
     {
@@ -118,6 +119,9 @@ def _process_git_source(config):
                 cv.Required(CONF_SLIDING_WINDOW_AVERAGE_SIZE): cv.positive_int,
             }
         ),
+        cv.Optional(KEY_MINIMUM_ESPHOME_VERSION): cv.All(
+            cv.version_number, cv.validate_esphome_version
+        ),
     }
 )
 
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index fa1170fb9307..9f577773d42e 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -57,6 +57,7 @@
     TYPE_GIT,
     TYPE_LOCAL,
     VALID_SUBSTITUTIONS_CHARACTERS,
+    __version__ as ESPHOME_VERSION,
 )
 from esphome.core import (
     CORE,
@@ -1895,6 +1896,16 @@ def version_number(value):
         raise Invalid("Not a valid version number") from e
 
 
+def validate_esphome_version(value: str):
+    min_version = Version.parse(value)
+    current_version = Version.parse(ESPHOME_VERSION)
+    if current_version < min_version:
+        raise Invalid(
+            f"Your ESPHome version is too old. Please update to at least {min_version}"
+        )
+    return value
+
+
 def platformio_version_constraint(value):
     # for documentation on valid version constraints:
     # https://docs.platformio.org/en/latest/core/userguide/platforms/cmd_install.html#cmd-platform-install
diff --git a/esphome/core/config.py b/esphome/core/config.py
index e4a1fdcafa1d..f3d732a8fc25 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -102,16 +102,6 @@ def valid_project_name(value: str):
     return value
 
 
-def validate_version(value: str):
-    min_version = cv.Version.parse(value)
-    current_version = cv.Version.parse(ESPHOME_VERSION)
-    if current_version < min_version:
-        raise cv.Invalid(
-            f"Your ESPHome version is too old. Please update to at least {min_version}"
-        )
-    return value
-
-
 if "ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT" in os.environ:
     _compile_process_limit_default = min(
         int(os.environ["ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT"]),
@@ -164,7 +154,7 @@ def validate_version(value: str):
                 }
             ),
             cv.Optional(CONF_MIN_VERSION, default=ESPHOME_VERSION): cv.All(
-                cv.version_number, validate_version
+                cv.version_number, cv.validate_esphome_version
             ),
             cv.Optional(
                 CONF_COMPILE_PROCESS_LIMIT, default=_compile_process_limit_default

From 6ae865fd7b9dcc308fd8ae219f18702f7d674849 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 19 Feb 2024 11:04:46 +1300
Subject: [PATCH 2/2] Move min esphome version to `micro` block

---
 esphome/components/micro_wake_word/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/micro_wake_word/__init__.py b/esphome/components/micro_wake_word/__init__.py
index b33a8a01d652..209a1412ca3e 100644
--- a/esphome/components/micro_wake_word/__init__.py
+++ b/esphome/components/micro_wake_word/__init__.py
@@ -117,11 +117,11 @@ def _process_git_source(config):
             {
                 cv.Required(CONF_PROBABILITY_CUTOFF): cv.float_,
                 cv.Required(CONF_SLIDING_WINDOW_AVERAGE_SIZE): cv.positive_int,
+                cv.Optional(KEY_MINIMUM_ESPHOME_VERSION): cv.All(
+                    cv.version_number, cv.validate_esphome_version
+                ),
             }
         ),
-        cv.Optional(KEY_MINIMUM_ESPHOME_VERSION): cv.All(
-            cv.version_number, cv.validate_esphome_version
-        ),
     }
 )