Skip to content

Commit c9979ae

Browse files
FoamyGuyFoamyGuy
committed
Merge branch 'refs/heads/main' into vectorio_is_colliding
# Conflicts: # ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk
2 parents 2ba399d + d8b9f64 commit c9979ae

File tree

702 files changed

+11650
-5566
lines changed

Some content is hidden

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

702 files changed

+11650
-5566
lines changed

‎.codespell/exclude-file.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ USB_PRODUCT = "BLOK"
55
print(binascii.b2a_base64(b"fo"))
66
# again, neither will "there" or "wither", since they have "the"
77
i1Qb$TE"rl
8+
ZEN = "the zen of python beautiful is better than ugly explicit is better than implicit simple is better than complex complex is better than complicated flat is better than nested sparse is better than dense readability counts special cases arent special enough to break the rules although practicality beats purity errors should never pass silently unless explicitly silenced in the face of ambiguity refuse the temptation to guess there should be one and preferably only one obvious way to do it although that way may not be obvious at first unless youre dutch now is better than never although never is often better than right now if the implementation is hard to explain its a bad idea if the implementation is easy to explain it may be a good idea namespaces are one honking great idea lets do more of those"
9+
"arent",
10+
"youre",

‎.git-blame-ignore-revs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# all: Update Python formatting to ruff-format.
2+
bbd8760bd9a2302e5abee29db279102bb11d7732
3+
14
# all: Fix various spelling mistakes found by codespell 2.2.6.
25
cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
36

‎.gitattributes‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010
*.props text eol=crlf
1111
*.bat text eol=crlf
1212

13+
# CIRCUITPY-CHANGE: add some more binary types.
1314
# These are binary so should never be modified by git.
1415
*.a binary
16+
*.ico binary
1517
*.png binary
1618
*.jpg binary
1719
*.dxf binary
1820
*.mpy binary
21+
*.der binary
1922
*.deb binary
2023
*.zip binary
2124
*.pdf binary
@@ -24,11 +27,4 @@
2427
# These should also not be modified by git.
2528
tests/basics/string_cr_conversion.py -text
2629
tests/basics/string_crlf_conversion.py -text
27-
ports/stm32/pybcdc.inf_template -text
28-
ports/stm32/usbhost/** -text
29-
ports/cc3200/hal/aes.c -text
30-
ports/cc3200/hal/aes.h -text
31-
ports/cc3200/hal/des.c -text
32-
ports/cc3200/hal/i2s.c -text
33-
ports/cc3200/hal/i2s.h -text
34-
ports/cc3200/version.h -text
30+
# CIRCUITPY-CHANGE: remove non-CircuitPython tests

‎.github/actions/upload_aws/action.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ runs:
2020
steps:
2121
- name: Upload to S3
2222
if: >-
23-
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
24-
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
23+
(github.event_name == 'push' && github.repository_owner == 'adafruit') &&
24+
(github.ref == 'refs/heads/main' ||
25+
(startswith(github.ref, 'refs/heads/') && endswith(github.ref, '.x'))) ||
26+
(github.event_name == 'release' &&
27+
(github.event.action == 'published' || github.event.action == 'rerequested'))
2528
run: >-
2629
[ -z "$AWS_ACCESS_KEY_ID" ] ||
2730
aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }}

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,13 @@ jobs:
255255
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
256256
unzip -q -d /tmp gcc-arm.zip
257257
tar -C /tmp/arm-gnu-toolchain* -cf - . | tar -C /usr/local -xf -
258-
pip install wheel
259-
# requirements_dev.txt doesn't install on windows. (with msys2 python)
258+
# We could use a venv instead, but that requires entering the venv on each run step
259+
# that runs in its own shell. There are some actions that help with that, but not for msys2
260+
# that I can find. (dhalbert)
261+
pip install --break-system-packages wheel
262+
# requirements-dev.txt doesn't install on windows. (with msys2 python)
260263
# instead, pick a subset for what we want to do
261-
pip install cascadetoml jinja2 typer click intelhex
264+
pip install --break-system-packages cascadetoml jinja2 typer click intelhex
262265
# check that installed packages work....?
263266
which python; python --version; python -c "import cascadetoml"
264267
which python3; python3 --version; python3 -c "import cascadetoml"

‎.github/workflows/run-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ on:
99

1010
jobs:
1111
run:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
strategy:
1414
fail-fast: false
1515
matrix:
1616
test: [all, mpy, native, native_mpy]
1717
env:
1818
CP_VERSION: ${{ inputs.cp-version }}
19-
MICROPY_CPYTHON3: python3.8
19+
MICROPY_CPYTHON3: python3.12
2020
MICROPY_MICROPYTHON: ../ports/unix/build-coverage/micropython
2121
TEST_all:
2222
TEST_mpy: --via-mpy -d basics float micropython
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up python
3333
uses: actions/setup-python@v5
3434
with:
35-
python-version: 3.8
35+
python-version: 3.12
3636
- name: Set up submodules
3737
uses: ./.github/actions/deps/submodules
3838
with:

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
# CIRCUITPY-CHANGES: many additions
6+
57
# Compiled Sources
68
###################
79
*.o

‎.gitmodules‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146-
branch = circuitpython-v5.2.2
146+
branch = circuitpython-v5.3
147147
[submodule "ports/espressif/esp-protocols"]
148148
path = ports/espressif/esp-protocols
149149
url = https://github.com/espressif/esp-protocols.git
@@ -345,7 +345,6 @@
345345
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
346346
path = ports/raspberrypi/lib/Pico-PIO-USB
347347
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
348-
branch = main
349348
[submodule "lib/micropython-lib"]
350349
path = lib/micropython-lib
351350
url = https://github.com/micropython/micropython-lib.git
@@ -354,8 +353,8 @@
354353
url = https://github.com/adafruit/certificates
355354
[submodule "lib/tlsf"]
356355
path = lib/tlsf
357-
url = https://github.com/adafruit/tlsf.git
358-
branch = circuitpython
356+
url = https://github.com/espressif/tlsf.git
357+
branch = idf
359358
[submodule "frozen/CircuitPython_AXP313A"]
360359
path = frozen/CircuitPython_AXP313A
361360
url = https://github.com/bill88t/CircuitPython_AXP313A
@@ -395,3 +394,15 @@
395394
[submodule "frozen/Adafruit_CircuitPython_LED_Animation"]
396395
path = frozen/Adafruit_CircuitPython_LED_Animation
397396
url = https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation
397+
[submodule "frozen/CircuitPython_AXP2101"]
398+
path = frozen/CircuitPython_AXP2101
399+
url = https://github.com/CDarius/CircuitPython_AXP2101
400+
[submodule "frozen/CircuitPython_BMA423"]
401+
path = frozen/CircuitPython_BMA423
402+
url = https://github.com/jposada202020/CircuitPython_BMA423
403+
[submodule "frozen/Adafruit_CircuitPython_PCF8563"]
404+
path = frozen/Adafruit_CircuitPython_PCF8563
405+
url = https://github.com/adafruit/Adafruit_CircuitPython_PCF8563
406+
[submodule "frozen/Adafruit_CircuitPython_Wiznet5k"]
407+
path = frozen/Adafruit_CircuitPython_Wiznet5k
408+
url = https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k

‎.pre-commit-config.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
#
33
# SPDX-License-Identifier: Unlicense
44

5+
# CIRCUITPY-CHANGE: CircuitPython-specific.
6+
57
repos:
68
- repo: https://github.com/pre-commit/pre-commit-hooks
79
rev: v4.0.1
810
hooks:
911
- id: check-yaml
1012
- id: end-of-file-fixer
11-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/raspberrypi/sdk|lib/tinyusb)'
1214
- id: trailing-whitespace
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff)'
15+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|lib/tinyusb)'
1416
- repo: https://github.com/codespell-project/codespell
1517
rev: v2.2.4
1618
hooks:
@@ -22,7 +24,8 @@ repos:
2224
lib/|
2325
tests/unicode/data/utf-8_invalid.txt|
2426
tests/extmod/data/qr.pgm|
25-
tests/basics/bytearray_byte_operations.py
27+
tests/basics/bytearray_byte_operations.py|
28+
ports/raspberrypi/sdk
2629
)
2730
- repo: local
2831
hooks:
@@ -37,3 +40,8 @@ repos:
3740
entry: python3 tools/codeformat.py
3841
types_or: [c, python]
3942
language: system
43+
exclude: |
44+
(?x)^(
45+
lib/tinyusb|
46+
ports/raspberrypi/sdk
47+
)

‎.readthedocs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
version: 2
1010

1111
build:
12-
os: ubuntu-20.04
12+
os: ubuntu-24.04
1313
tools:
1414
python: "3"
1515
jobs:

0 commit comments

Comments
 (0)