Skip to content

Commit 9ed5fda

Browse files
committed
chore: Merge remote-tracking branch 'esp/main' into wokwi-python-client
2 parents 9ff0543 + 586fbdd commit 9ed5fda

File tree

51 files changed

+428
-498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+428
-498
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
language: [ 'python' ]
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
- name: Initialize CodeQL
2121
uses: github/codeql-action/init@v3
2222
with:

.github/workflows/publish_pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
deploy:
1010
runs-on: ubuntu-22.04
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- name: Set up Python
14-
uses: actions/setup-python@v5
14+
uses: actions/setup-python@v6
1515
with:
1616
python-version: "3.7"
1717
- name: Build packages

.github/workflows/sync-jira.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
pull-requests: write
4747
steps:
4848
- name: Check out
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v5
5050

5151
- name: Run synchronization to Jira
5252
uses: espressif/sync-jira-actions@v1

.github/workflows/test-build-docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
test-build-docs:
1212
runs-on: ubuntu-22.04
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: Set up Python
16-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1717
with:
18-
python-version: "3.7"
18+
python-version: "3.10"
1919
- name: Install dependencies
2020
run: |
2121
bash foreach.sh install

.github/workflows/test-build-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
test-build-packages:
88
runs-on: ubuntu-22.04
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111
- name: Set up Python
12-
uses: actions/setup-python@v5
12+
uses: actions/setup-python@v6
1313
with:
1414
python-version: "3.7"
1515
- name: Build packages

.github/workflows/test-python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
include:
24-
- python-version: "3.7"
24+
- python-version: "3.10"
2525
arch: "ARM64"
2626
- python-version: "3.13"
2727
arch: "X64"
@@ -34,7 +34,7 @@ jobs:
3434
image: python:${{ matrix.python-version }}
3535
options: --privileged
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838
- name: Install dependencies
3939
run: |
4040
apt update && apt install -y socat zip

.pre-commit-config.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ exclude: |
88
99
repos:
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
11-
rev: v5.0.0
11+
rev: v6.0.0
1212
hooks:
1313
- id: trailing-whitespace
1414
- id: end-of-file-fixer
1515
- id: mixed-line-ending
1616
args: ["-f=lf"]
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: "v0.11.6"
18+
rev: "v0.12.12"
1919
hooks:
20-
- id: ruff
20+
- id: ruff-check
2121
args: ["--fix"]
2222
- id: ruff-format
23-
args: ["--preview"]
2423

2524
# documentation
2625
- repo: https://github.com/sphinx-contrib/sphinx-lint

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sphinx:
1111
build:
1212
os: ubuntu-22.04
1313
tools:
14-
python: "3.7"
14+
python: "3.10"
1515

1616
python:
1717
install:

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# CHANGELOG
22

3+
## v2.0.0 (TBD)
4+
5+
### Breaking Changes
6+
7+
- **Python Support**: Drop support for Python 3.7, 3.8, 3.9. Now requires Python 3.10+
8+
- **esptool**: Update esptool requirement to >=5.1.dev1,<6 (from ~=4.9)
9+
- **Deprecated Code Removal**:
10+
- Remove `EsptoolArgs` class from `pytest-embedded-serial-esp`
11+
- Remove deprecated parameters `hard_reset_after` and `no_stub` from `use_esptool()` decorator
12+
- Remove deprecated `stub` property from `EspSerial` class (use `esp` instead)
13+
- Remove deprecated `parse_test_menu()` and `parse_unity_menu_from_str()` methods from `IdfUnityDutMixin` (use `test_menu` property instead)
14+
- Remove deprecated CLI option `--add-target-as-marker` (use `--add-target-as-marker-with-amount` instead)
15+
16+
### Migration Guide
17+
18+
1. **Python Version**: Upgrade to Python 3.10 or higher
19+
2. **esptool**: Update esptool to version 5.1.dev1 or higher (but less than 6.0)
20+
3. **Code Changes**:
21+
- Replace `dut.stub` with `dut.esp`
22+
- Replace `dut.parse_test_menu()` calls with `dut.test_menu` property access
23+
- Replace `parse_unity_menu_from_str()` with `_parse_unity_menu_from_str()` if needed. `dut.test_menu` is preferred.
24+
- Update CLI usage from `--add-target-as-marker` to `--add-target-as-marker-with-amount`
25+
- Remove any usage of `EsptoolArgs` class
26+
- Remove `hard_reset_after` and `no_stub` parameters from `use_esptool()` calls
27+
328
## v1.17.0a0 (2025-08-07)
429

530
### Feat

conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import shutil
33
import sys
44
import textwrap
5-
from typing import List, Pattern
5+
from re import Pattern
66

77
import pytest
88
from _pytest.config import Config
@@ -59,7 +59,7 @@ def cache_file_remove(cache_dir):
5959

6060
@pytest.fixture
6161
def first_index_of_messages():
62-
def _fake(_pattern: Pattern, _messages: List[str], _start: int = 0) -> int:
62+
def _fake(_pattern: Pattern, _messages: list[str], _start: int = 0) -> int:
6363
for i, _message in enumerate(_messages):
6464
if _pattern.match(_message) and i >= _start:
6565
return i

0 commit comments

Comments
 (0)