From a2816840854036fb69ac53cef285a3971a576a62 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 4 Aug 2025 16:44:37 +0200
Subject: [PATCH 1/3] ci: change file pattern to trigger the test

---
 .github/workflows/test-python.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
index a9c3d91c..403a9fb1 100644
--- a/.github/workflows/test-python.yml
+++ b/.github/workflows/test-python.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - "**.py"
+      - "*/pyproject.toml"
       - .github/workflows/test-python.yml
       - "!docs/**"
   push:

From ebfe32fb921119dd20897732f89bddacf7fc1cfc Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 4 Aug 2025 16:41:47 +0200
Subject: [PATCH 2/3] feat(esp): compatible with esptool 5

---
 pytest-embedded-idf/tests/test_idf.py     | 2 +-
 pytest-embedded-serial-esp/pyproject.toml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pytest-embedded-idf/tests/test_idf.py b/pytest-embedded-idf/tests/test_idf.py
index de0153ba..0e64e920 100644
--- a/pytest-embedded-idf/tests/test_idf.py
+++ b/pytest-embedded-idf/tests/test_idf.py
@@ -197,7 +197,7 @@ def test_idf_serial_flash_with_erase_nvs(testdir):
         import pytest
 
         def test_idf_serial_flash_with_erase_nvs(dut):
-            dut.expect('Erasing region')  # from "erase-nvs"
+            dut.expect('region')  # from "erase-nvs"
             dut.expect('Hash of data verified.')  # from flash
             dut.expect('Hello world!')
             dut.expect('Restarting')
diff --git a/pytest-embedded-serial-esp/pyproject.toml b/pytest-embedded-serial-esp/pyproject.toml
index cc88e1af..39b44e58 100644
--- a/pytest-embedded-serial-esp/pyproject.toml
+++ b/pytest-embedded-serial-esp/pyproject.toml
@@ -32,7 +32,8 @@ requires-python = ">=3.7"
 
 dependencies = [
     "pytest-embedded-serial~=1.16.1",
-    "esptool~=4.9",
+    "esptool>=4.9,<5; python_version<'3.10'",
+    "esptool>=5.1.dev1,<6; python_version>='3.10'",
 ]
 
 [project.urls]

From b8bf288ccae2efad84bc35c3d7d3fd0dda1cac07 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 6 Aug 2025 16:02:11 +0200
Subject: [PATCH 3/3] chore: ignore FutureWarning

---
 pyproject.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 6d254430..797fcc9d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,3 +26,7 @@ version_files = [
 [tool.pytest.ini_options]
 norecursedirs = 'examples/*'
 addopts = "-s"
+filterwarnings = [
+    "ignore::FutureWarning",
+]
+junit_family = "xunit1"