Skip to content

Commit 2b119c8

Browse files
authored
Merge branch 'micropython:master' into esp32_bitstream
2 parents ef870bf + a277fe4 commit 2b119c8

File tree

143 files changed

+2298
-491
lines changed

Some content is hidden

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

143 files changed

+2298
-491
lines changed

.github/workflows/code_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v5
14-
- uses: actions/setup-python@v5
14+
- uses: actions/setup-python@v6
1515
- name: Install packages
1616
run: source tools/ci.sh && ci_c_code_formatting_setup
1717
- name: Run code formatting

.github/workflows/code_size_comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: 'Download artifact'
1717
id: download-artifact
18-
uses: actions/github-script@v7
18+
uses: actions/github-script@v8
1919
with:
2020
result-encoding: string
2121
script: |
@@ -56,7 +56,7 @@ jobs:
5656
run: unzip code-size-report.zip
5757
- name: Post comment to pull request
5858
if: steps.download-artifact.outputs.result == 'ok'
59-
uses: actions/github-script@v7
59+
uses: actions/github-script@v8
6060
with:
6161
github-token: ${{secrets.GITHUB_TOKEN}}
6262
script: |

.github/workflows/commit_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
- uses: actions/checkout@v5
1414
with:
1515
fetch-depth: 100
16-
- uses: actions/setup-python@v5
16+
- uses: actions/setup-python@v6
1717
- name: Check commit message formatting
1818
run: source tools/ci.sh && ci_commit_formatting_run

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@v5
21-
- uses: actions/setup-python@v5
21+
- uses: actions/setup-python@v6
2222
- name: Install Python packages
2323
run: pip install -r docs/requirements.txt
2424
- name: Build unix port

.github/workflows/mpremote.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Setting this to zero means fetch all history and tags,
1717
# which hatch-vcs can use to discover the version tag.
1818
fetch-depth: 0
19-
- uses: actions/setup-python@v5
19+
- uses: actions/setup-python@v6
2020
- name: Install build tools
2121
run: pip install build
2222
- name: Build mpremote wheel

.github/workflows/mpy_format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
test:
18-
runs-on: ubuntu-22.04 # use 22.04 to get python2
18+
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v5
2121
- name: Install packages

.github/workflows/ports_qemu.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,15 @@ jobs:
5050
- name: Print failures
5151
if: failure()
5252
run: tests/run-tests.py --print-failures
53+
54+
build_and_test_rv64:
55+
runs-on: ubuntu-latest
56+
steps:
57+
- uses: actions/checkout@v5
58+
- name: Install packages
59+
run: source tools/ci.sh && ci_qemu_setup_rv64
60+
- name: Build and run test suite
61+
run: source tools/ci.sh && ci_qemu_build_rv64
62+
- name: Print failures
63+
if: failure()
64+
run: tests/run-tests.py --print-failures

.github/workflows/ports_unix.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
steps:
7373
- uses: actions/checkout@v5
74-
- uses: actions/setup-python@v5
74+
- uses: actions/setup-python@v6
7575
# Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
7676
# Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
7777
with:
@@ -121,7 +121,7 @@ jobs:
121121
run: tests/run-tests.py --print-failures
122122

123123
nanbox:
124-
runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
124+
runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
125125
steps:
126126
- uses: actions/checkout@v5
127127
- name: Install packages
@@ -135,7 +135,7 @@ jobs:
135135
run: tests/run-tests.py --print-failures
136136

137137
longlong:
138-
runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
138+
runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
139139
steps:
140140
- uses: actions/checkout@v5
141141
- name: Install packages
@@ -204,7 +204,7 @@ jobs:
204204
runs-on: ubuntu-latest
205205
steps:
206206
- uses: actions/checkout@v5
207-
- uses: actions/setup-python@v5
207+
- uses: actions/setup-python@v6
208208
# Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
209209
# Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
210210
with:
@@ -221,7 +221,7 @@ jobs:
221221
runs-on: macos-latest
222222
steps:
223223
- uses: actions/checkout@v5
224-
- uses: actions/setup-python@v5
224+
- uses: actions/setup-python@v6
225225
with:
226226
python-version: '3.8'
227227
- name: Build
@@ -281,7 +281,7 @@ jobs:
281281
runs-on: ubuntu-latest
282282
steps:
283283
- uses: actions/checkout@v5
284-
- uses: actions/setup-python@v5
284+
- uses: actions/setup-python@v6
285285
# Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
286286
# Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
287287
with:
@@ -306,7 +306,7 @@ jobs:
306306
runs-on: ubuntu-latest
307307
steps:
308308
- uses: actions/checkout@v5
309-
- uses: actions/setup-python@v5
309+
- uses: actions/setup-python@v6
310310
# Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
311311
# Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
312312
with:

.github/workflows/ports_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
run:
110110
shell: msys2 {0}
111111
steps:
112-
- uses: actions/setup-python@v5
112+
- uses: actions/setup-python@v6
113113
# note: can go back to installing mingw-w64-${{ matrix.env }}-python after
114114
# MSYS2 updates to Python >3.12 (due to settrace compatibility issue)
115115
with:

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ This repository contains the following components:
8080
- [examples/](examples/) -- a few example Python scripts.
8181

8282
"make" is used to build the components, or "gmake" on BSD-based systems.
83-
You will also need bash, gcc, and Python 3.3+ available as the command `python3`
84-
(if your system only has Python 2.7 then invoke make with the additional option
85-
`PYTHON=python2`). Some ports (rp2 and esp32) additionally use CMake.
83+
You will also need bash, gcc, and Python 3.3+ available as the command `python3`.
84+
Some ports (rp2 and esp32) additionally use CMake.
8685

8786
Supported platforms & architectures
8887
-----------------------------------

0 commit comments

Comments
 (0)