Skip to content

Commit 77cc926

Browse files
authored
Merge pull request #362 from espressif/feat/esptool-5-compatible
feat(esp): compatible with esptool 5
2 parents a8466cb + b8bf288 commit 77cc926

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

.github/workflows/test-python.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- "**.py"
7+
- "*/pyproject.toml"
78
- .github/workflows/test-python.yml
89
- "!docs/**"
910
push:

pyproject.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ version_files = [
2626
[tool.pytest.ini_options]
2727
norecursedirs = 'examples/*'
2828
addopts = "-s"
29+
filterwarnings = [
30+
"ignore::FutureWarning",
31+
]
32+
junit_family = "xunit1"

pytest-embedded-idf/tests/test_idf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def test_idf_serial_flash_with_erase_nvs(testdir):
197197
import pytest
198198
199199
def test_idf_serial_flash_with_erase_nvs(dut):
200-
dut.expect('Erasing region') # from "erase-nvs"
200+
dut.expect('region') # from "erase-nvs"
201201
dut.expect('Hash of data verified.') # from flash
202202
dut.expect('Hello world!')
203203
dut.expect('Restarting')

pytest-embedded-serial-esp/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ requires-python = ">=3.7"
3232

3333
dependencies = [
3434
"pytest-embedded-serial~=1.16.1",
35-
"esptool~=4.9",
35+
"esptool>=4.9,<5; python_version<'3.10'",
36+
"esptool>=5.1.dev1,<6; python_version>='3.10'",
3637
]
3738

3839
[project.urls]

0 commit comments

Comments
 (0)