mirror of
				https://github.com/esphome/esphome.git
				synced 2025-11-04 09:01:49 +00:00 
			
		
		
		
	Merge branch 'dev' into bluetooth_proxy_heap
This commit is contained in:
		@@ -11,7 +11,7 @@ ci:
 | 
			
		||||
repos:
 | 
			
		||||
  - repo: https://github.com/astral-sh/ruff-pre-commit
 | 
			
		||||
    # Ruff version.
 | 
			
		||||
    rev: v0.12.3
 | 
			
		||||
    rev: v0.12.4
 | 
			
		||||
    hooks:
 | 
			
		||||
      # Run the linter.
 | 
			
		||||
      - id: ruff
 | 
			
		||||
 
 | 
			
		||||
@@ -1620,7 +1620,9 @@ void WebServer::handle_event_request(AsyncWebServerRequest *request, const UrlMa
 | 
			
		||||
  request->send(404);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static std::string get_event_type(event::Event *event) { return event->last_event_type ? *event->last_event_type : ""; }
 | 
			
		||||
static std::string get_event_type(event::Event *event) {
 | 
			
		||||
  return (event && event->last_event_type) ? *event->last_event_type : "";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
std::string WebServer::event_state_json_generator(WebServer *web_server, void *source) {
 | 
			
		||||
  auto *event = static_cast<event::Event *>(source);
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
 | 
			
		||||
esptool==4.9.0
 | 
			
		||||
click==8.1.7
 | 
			
		||||
esphome-dashboard==20250514.0
 | 
			
		||||
aioesphomeapi==36.0.0
 | 
			
		||||
aioesphomeapi==36.0.1
 | 
			
		||||
zeroconf==0.147.0
 | 
			
		||||
puremagic==1.30
 | 
			
		||||
ruamel.yaml==0.18.14 # dashboard_import
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
pylint==3.3.7
 | 
			
		||||
flake8==7.3.0  # also change in .pre-commit-config.yaml when updating
 | 
			
		||||
ruff==0.12.3  # also change in .pre-commit-config.yaml when updating
 | 
			
		||||
ruff==0.12.4  # also change in .pre-commit-config.yaml when updating
 | 
			
		||||
pyupgrade==3.20.0  # also change in .pre-commit-config.yaml when updating
 | 
			
		||||
pre-commit
 | 
			
		||||
 | 
			
		||||
@@ -8,7 +8,7 @@ pre-commit
 | 
			
		||||
pytest==8.4.1
 | 
			
		||||
pytest-cov==6.2.1
 | 
			
		||||
pytest-mock==3.14.1
 | 
			
		||||
pytest-asyncio==1.0.0
 | 
			
		||||
pytest-xdist==3.7.0
 | 
			
		||||
pytest-asyncio==1.1.0
 | 
			
		||||
pytest-xdist==3.8.0
 | 
			
		||||
asyncmock==0.4.2
 | 
			
		||||
hypothesis==6.92.1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user