Skip to content

Commit eb43c44

Browse files
IhorNehrutsaIhorNehrutsa
committed
Merge remote-tracking branch 'upstream/master' into DBG_macro
2 parents 3db8d33 + 7d66ae6 commit eb43c44

File tree

1,594 files changed

+29519
-17032
lines changed

Some content is hidden

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

1,594 files changed

+29519
-17032
lines changed

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# all: Fix spelling mistakes based on codespell check.
2+
b1229efbd1509654dec6053865ab828d769e29db
3+
14
# top: Update Python formatting to black "2023 stable style".
25
8b2748269244304854b3462cb8902952b4dcb892
36

‎.github/ISSUE_TEMPLATE/security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Security report
3-
about: Report a security issue or vunerability in MicroPython
3+
about: Report a security issue or vulnerability in MicroPython
44
title: ''
55
labels: security
66
assignees: ''

‎.github/workflows/code_formatting.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
build:
10+
code-formatting:
1111
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v3
@@ -18,3 +18,13 @@ jobs:
1818
run: source tools/ci.sh && ci_code_formatting_run
1919
- name: Check code formatting
2020
run: git diff --exit-code
21+
22+
code-spelling:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v3
26+
- uses: actions/setup-python@v4
27+
- name: Install packages
28+
run: source tools/ci.sh && ci_code_spell_setup
29+
- name: Run spell checker
30+
run: source tools/ci.sh && ci_code_spell_run

‎.github/workflows/mpremote.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v3
1515
with:
16-
# Version is determined from git,
17-
# should be deep enough to get to latest tag
18-
fetch-depth: '1000'
19-
- run: |
20-
git fetch --prune --unshallow --tags
16+
# Setting this to zero means fetch all history and tags,
17+
# which hatch-vcs can use to discover the version tag.
18+
fetch-depth: 0
2119
- uses: actions/setup-python@v4
2220
- name: Install build tools
2321
run: pip install build

‎.github/workflows/ports_esp32.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,11 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
build_idf402:
21+
build_idf50:
2222
runs-on: ubuntu-20.04
2323
steps:
2424
- uses: actions/checkout@v3
2525
- name: Install packages
26-
run: source tools/ci.sh && ci_esp32_idf402_setup
27-
- name: Build
28-
run: source tools/ci.sh && ci_esp32_build
29-
30-
build_idf44:
31-
runs-on: ubuntu-20.04
32-
steps:
33-
- uses: actions/checkout@v3
34-
- name: Install packages
35-
run: source tools/ci.sh && ci_esp32_idf44_setup
26+
run: source tools/ci.sh && ci_esp32_idf50_setup
3627
- name: Build
3728
run: source tools/ci.sh && ci_esp32_build

‎.github/workflows/ports_unix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
run: tests/run-tests.py --print-failures
8686

8787
coverage_32bit:
88-
runs-on: ubuntu-latest
88+
runs-on: ubuntu-20.04 # use 20.04 to get libffi-dev:i386
8989
steps:
9090
- uses: actions/checkout@v3
9191
- name: Install packages
@@ -103,7 +103,7 @@ jobs:
103103
run: tests/run-tests.py --print-failures
104104

105105
nanbox:
106-
runs-on: ubuntu-20.04 # use 20.04 to get python2
106+
runs-on: ubuntu-20.04 # use 20.04 to get python2, and libffi-dev:i386
107107
steps:
108108
- uses: actions/checkout@v3
109109
- name: Install packages

‎.github/workflows/ruff.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
2+
name: Python code lint with ruff
3+
on: [push, pull_request]
4+
jobs:
5+
ruff:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v3
9+
- run: pip install --user ruff
10+
- run: ruff --format=github .

‎.pre-commit-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ repos:
1111
language: python
1212
verbose: true
1313
stages: [commit-msg]
14+
- repo: https://github.com/charliermarsh/ruff-pre-commit
15+
rev: v0.0.265
16+
hooks:
17+
- id: ruff

‎CODECONVENTIONS.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ It's also ok to drop file extensions.
1111

1212
Besides prefix, first line of a commit message should describe a
1313
change clearly and to the point, and be a grammatical sentence with
14-
final full stop. First line should fit within 72 characters. Examples
14+
final full stop. First line must fit within 72 characters. Examples
1515
of good first line of commit messages:
1616

1717
py/objstr: Add splitlines() method.
@@ -27,12 +27,9 @@ change beyond 5 lines would likely require such detailed description.
2727
To get good practical examples of good commits and their messages, browse
2828
the `git log` of the project.
2929

30-
When committing you are encouraged to sign-off your commit by adding
31-
"Signed-off-by" lines and similar, eg using "git commit -s". If you don't
32-
explicitly sign-off in this way then the commit message, which includes your
33-
name and email address in the "Author" line, implies your sign-off. In either
34-
case, of explicit or implicit sign-off, you are certifying and signing off
35-
against the following:
30+
When committing you must sign-off your commit by adding "Signed-off-by:"
31+
line(s) at the end of the commit message, e.g. using `git commit -s`. You
32+
are then certifying and signing off against the following:
3633

3734
* That you wrote the change yourself, or took it from a project with
3835
a compatible license (in the latter case the commit message, and possibly
@@ -49,10 +46,9 @@ against the following:
4946
* Your contribution including commit message will be publicly and
5047
indefinitely available for anyone to access, including redistribution
5148
under the terms of the project's license.
52-
* Your signature for all of the above, which is the "Signed-off-by" line
53-
or the "Author" line in the commit message, includes your full real name and
54-
a valid and active email address by which you can be contacted in the
55-
foreseeable future.
49+
* Your signature for all of the above, which is the "Signed-off-by" line,
50+
includes your full real name and a valid and active email address by
51+
which you can be contacted in the foreseeable future.
5652

5753
Code auto-formatting
5854
====================
@@ -255,7 +251,7 @@ Documentation conventions
255251
=========================
256252

257253
MicroPython generally follows CPython in documentation process and
258-
conventions. reStructuredText syntax is used for the documention.
254+
conventions. reStructuredText syntax is used for the documentation.
259255

260256
Specific conventions/suggestions:
261257

‎LICENSE

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2022 Damien P. George
3+
Copyright (c) 2013-2023 Damien P. George
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,6 @@ used during the build process and is not part of the compiled source code.
3636
/ (MIT)
3737
/drivers
3838
/cc3100 (BSD-3-clause)
39-
/wiznet5k (BSD-3-clause)
4039
/lib
4140
/asf4 (Apache-2.0)
4241
/axtls (BSD-3-clause)
@@ -61,12 +60,15 @@ used during the build process and is not part of the compiled source code.
6160
/tinytest (BSD-3-clause)
6261
/tinyusb (MIT)
6362
/uzlib (Zlib)
63+
/wiznet5k (MIT)
6464
/logo (uses OFL-1.1)
6565
/ports
6666
/cc3200
6767
/hal (BSD-3-clause)
6868
/simplelink (BSD-3-clause)
6969
/FreeRTOS (GPL-2.0 with FreeRTOS exception)
70+
/esp32
71+
/ppp_set_auth.* (Apache-2.0)
7072
/stm32
7173
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
7274
/stm32_it.* (MIT + BSD-3-clause)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy