From f9da8dbfb85e329be30dfcf02bfc6431ef1fa81c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 17 Feb 2025 15:48:24 -0600
Subject: [PATCH 1/3] Replace glyphsets with esphome_glyphsets (#8261)

---
 esphome/components/font/__init__.py | 2 +-
 requirements.txt                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/font/__init__.py b/esphome/components/font/__init__.py
index e2051298fe..4f569379be 100644
--- a/esphome/components/font/__init__.py
+++ b/esphome/components/font/__init__.py
@@ -5,8 +5,8 @@ import os
 from pathlib import Path
 import re
 
+import esphome_glyphsets as glyphsets
 import freetype
-import glyphsets
 import requests
 
 from esphome import core, external_files
diff --git a/requirements.txt b/requirements.txt
index bb5bc768e1..b3a48a0442 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ aioesphomeapi==24.6.2
 zeroconf==0.144.3
 puremagic==1.27
 ruamel.yaml==0.18.6 # dashboard_import
-glyphsets==1.0.0
+esphome-glyphsets==0.1.0
 pillow==10.4.0
 freetype-py==2.5.1
 

From 64c8bcef2e562ebdb2d398d5c66c80c417b8129f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 17 Feb 2025 16:27:06 -0600
Subject: [PATCH 2/3] Bump aioesphomeapi to 29.1.0 (#8105)

---
 esphome/components/api/client.py | 11 ++++++++---
 requirements.txt                 |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/api/client.py b/esphome/components/api/client.py
index dd013c8c34..c61b8d5ea3 100644
--- a/esphome/components/api/client.py
+++ b/esphome/components/api/client.py
@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 import asyncio
-import logging
 from datetime import datetime
-from typing import Any
+import logging
+from typing import TYPE_CHECKING, Any
 
 from aioesphomeapi import APIClient
-from aioesphomeapi.api_pb2 import SubscribeLogsResponse
 from aioesphomeapi.log_runner import async_run
 
 from esphome.const import CONF_KEY, CONF_PASSWORD, CONF_PORT, __version__
@@ -14,6 +13,12 @@ from esphome.core import CORE
 
 from . import CONF_ENCRYPTION
 
+if TYPE_CHECKING:
+    from aioesphomeapi.api_pb2 import (
+        SubscribeLogsResponse,  # pylint: disable=no-name-in-module
+    )
+
+
 _LOGGER = logging.getLogger(__name__)
 
 
diff --git a/requirements.txt b/requirements.txt
index b3a48a0442..c15dcbbbf7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ platformio==6.1.16  # When updating platformio, also update Dockerfile
 esptool==4.7.0
 click==8.1.7
 esphome-dashboard==20250212.0
-aioesphomeapi==24.6.2
+aioesphomeapi==29.1.0
 zeroconf==0.144.3
 puremagic==1.27
 ruamel.yaml==0.18.6 # dashboard_import

From 6583e178107e63446ad9a21b3ebf82b7533d8c93 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 18 Feb 2025 13:39:42 +1300
Subject: [PATCH 3/3] Bump version to 2025.2.0b5

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 7c96e6eefb..7f576fce67 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2025.2.0b4"
+__version__ = "2025.2.0b5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (