Merge branch 'adafruit:main' into main

Author: snkYmkrct

.codespell/exclude-file.txt

@@ -5,3 +5,6 @@ USB_PRODUCT = "BLOK"
 print(binascii.b2a_base64(b"fo"))
         # again, neither will "there" or "wither", since they have "the"
 i1Qb$TE"rl
+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"
+    "arent",
+    "youre",

.devcontainer/add_kitware_archive.sh

@@ -0,0 +1,107 @@
+#!/bin/sh
+# -----------------------------------------------------------------------------
+# This script is from: https://apt.kitware.com/kitware-archive.sh
+#
+# It installs key and repo for the kitware CMAKE-archive.
+#
+# Author: Bernhard Bablok
+#
+# -----------------------------------------------------------------------------
+
+set -eu
+
+help() {
+  echo "Usage: $0 [--release <ubuntu-release>] [--rc]" > /dev/stderr
+}
+
+doing=
+rc=
+release=
+help=
+for opt in "$@"
+do
+  case "${doing}" in
+  release)
+    release="${opt}"
+    doing=
+    ;;
+  "")
+    case "${opt}" in
+    --rc)
+      rc=1
+      ;;
+    --release)
+      doing=release
+      ;;
+    --help)
+      help=1
+      ;;
+    esac
+    ;;
+  esac
+done
+
+if [ -n "${doing}" ]
+then
+  echo "--${doing} option given no argument." > /dev/stderr
+  echo > /dev/stderr
+  help
+  exit 1
+fi
+
+if [ -n "${help}" ]
+then
+  help
+  exit
+fi
+
+if [ -z "${release}" ]
+then
+  unset UBUNTU_CODENAME
+  . /etc/os-release
+
+  if [ -z "${UBUNTU_CODENAME+x}" ]
+  then
+    echo "This is not an Ubuntu system. Aborting." > /dev/stderr
+    exit 1
+  fi
+
+  release="${UBUNTU_CODENAME}"
+fi
+
+case "${release}" in
+noble|jammy|focal)
+  packages=
+  keyring_packages="ca-certificates gpg wget"
+  ;;
+*)
+  echo "Only Ubuntu Noble (24.04), Jammy (22.04), and Focal (20.04) are supported. Aborting." > /dev/stderr
+  exit 1
+  ;;
+esac
+
+get_keyring=
+if [ ! -f /usr/share/doc/kitware-archive-keyring/copyright ]
+then
+  packages="${packages} ${keyring_packages}"
+  get_keyring=1
+fi
+
+# Start the real work
+set -x
+
+apt-get update
+# shellcheck disable=SC2086
+apt-get install -y ${packages}
+
+test -n "${get_keyring}" && (wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg)
+
+echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release} main" > /etc/apt/sources.list.d/kitware.list
+if [ -n "${rc}" ]
+then
+  echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release}-rc main" >> /etc/apt/sources.list.d/kitware.list
+fi
+
+apt-get update
+test -n "${get_keyring}" && rm /usr/share/keyrings/kitware-archive-keyring.gpg
+apt-get install -y kitware-archive-keyring

.devcontainer/common_tools.sh

@@ -15,6 +15,11 @@ cd "$REPO_ROOT"
 
 # --- repositories and tools   ------------------------------------------------
 
+echo -e "[common_tools.sh] adding kitware-archive (for current CMAKE)"
+sudo .devcontainer/add_kitware_archive.sh
+echo -e "[common_tools.sh] installing current version of CMAKE"
+sudo apt-get -y install cmake
+
 echo -e "[common_tools.sh] adding pybricks/ppa"
 sudo add-apt-repository -y ppa:pybricks/ppa
 echo -e "[common_tools.sh] installing uncrustify and mtools"

.git-blame-ignore-revs

@@ -1,3 +1,15 @@
+# all: Prune trailing whitespace.
+dda9b9c6da5d3c31fa8769e581a753e95a270803
+
+# all: Remove the "STATIC" macro and just use "static" instead.
+decf8e6a8bb940d5829ca3296790631fcece7b21
+
+# renesas-ra: Fix spelling mistakes found by codespell.
+b3f2f18f927fa2fad10daf63d8c391331f5edf58
+
+# all: Update Python formatting to ruff-format.
+bbd8760bd9a2302e5abee29db279102bb11d7732
+
 # all: Fix various spelling mistakes found by codespell 2.2.6.
 cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
 

.gitattributes

@@ -10,12 +10,15 @@
 *.props text eol=crlf
 *.bat text eol=crlf
 
+# CIRCUITPY-CHANGE: add some more binary types.
 # These are binary so should never be modified by git.
 *.a binary
+*.ico binary
 *.png binary
 *.jpg binary
 *.dxf binary
 *.mpy binary
+*.der binary
 *.deb binary
 *.zip binary
 *.pdf binary
@@ -24,11 +27,4 @@
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
-ports/stm32/pybcdc.inf_template -text
-ports/stm32/usbhost/** -text
-ports/cc3200/hal/aes.c -text
-ports/cc3200/hal/aes.h -text
-ports/cc3200/hal/des.c -text
-ports/cc3200/hal/i2s.c -text
-ports/cc3200/hal/i2s.h -text
-ports/cc3200/version.h -text
+# CIRCUITPY-CHANGE: remove non-CircuitPython tests

.github/actions/deps/submodules/action.yml

@@ -22,7 +22,7 @@ inputs:
     - restore
 
   version:
-    description: 'Whether to generate CP version'
+    description: 'Whether to fetch tags to identify CP version'
     required: false
     default: false
     type: boolean

.github/actions/upload_aws/action.yml

@@ -20,8 +20,11 @@ runs:
   steps:
     - name: Upload to S3
       if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+        (github.event_name == 'push' && github.repository_owner == 'adafruit') &&
+         (github.ref == 'refs/heads/main' ||
+          (startswith(github.ref, 'refs/heads/') && endswith(github.ref, '.x'))) ||
+        (github.event_name == 'release' &&
+         (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: >-
         [ -z "$AWS_ACCESS_KEY_ID" ] ||
         aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }}

.github/workflows/build-board-custom.yml

@@ -36,27 +36,35 @@ run-name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ in
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Set up repository
       run: |
         git clone --filter=tree:0 https://github.com/adafruit/circuitpython.git $GITHUB_WORKSPACE
     - name: Checkout head / tag
+      env:
+        TAG: ${{ inputs.version == 'latest' && 'HEAD' || inputs.version }}
       run: |
-        git checkout ${{ inputs.version == 'latest' && 'HEAD' || inputs.version }}
+        git checkout "$TAG"
     - name: fork compatibility
       if: github.repository_owner != 'adafruit'
+      env:
+        REPO: ${{ github.repository }}
       run: |
-        git remote add fork https://github.com/${{github.repository}}.git
+        git remote add fork "https://github.com/$REPO.git"
         git fetch fork --filter=tree:0
     - name: branch compatibility
       if: inputs.branch != 'main' && inputs.version == 'latest' && github.repository_owner == 'adafruit'
+      env:
+        BRANCH: ${{ inputs.branch }}
       run: |
-        git checkout ${{inputs.branch}}
+        git checkout "$BRANCH"
     - name: branch compatibility (fork)
       if: inputs.branch != '' && inputs.version == 'latest' && github.repository_owner != 'adafruit'
+      env:
+        BRANCH: ${{ inputs.branch }}
       run: |
-        git checkout -b fork-branch fork/${{inputs.branch}}
+        git checkout -b fork-branch "fork/$BRANCH"
     - name: Set up identifier
       if: inputs.debug || inputs.flags != ''
       run: |
@@ -101,7 +109,12 @@ jobs:
         riscv64-unknown-elf-gcc --version || true
         mkfs.fat --version || true
     - name: Build board
-      run: make -j4 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
+      env:
+        TRANSLATION: ${{ inputs.language }}
+        BOARD: ${{ inputs.board }}
+        FLAGS: ${{ inputs.flags }}
+        DEBUG: ${{ inputs.debug && '1' || '0' }}
+      run: make -j4 $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
       working-directory: ports/${{ steps.set-up-port.outputs.port }}
     - name: Upload artifact
       uses: actions/upload-artifact@v4

.github/workflows/build-boards.yml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   board:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       CP_VERSION: ${{ inputs.cp-version }}
     strategy:
@@ -31,6 +31,7 @@ jobs:
         submodules: false
         show-progress: false
         fetch-depth: 1
+        persist-credentials: false
 
     - name: Set up python
       uses: actions/setup-python@v5

.github/workflows/build-mpy-cross.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -33,6 +33,7 @@ jobs:
         submodules: false
         show-progress: false
         fetch-depth: 1
+        persist-credentials: false
     - name: Set up python
       uses: actions/setup-python@v5
       with:
@@ -57,9 +58,12 @@ jobs:
       run: make -C mpy-cross -j4 -f Makefile.${{ matrix.mpy-cross }}
 
     - name: Set output
+      env:
+        EX: ${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
+        OS: ${{ env[format('OS_{0}', matrix.mpy-cross)] }}"
       run: |
-        echo >> $GITHUB_ENV "EX=${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}"
-        echo >> $GITHUB_ENV "OS=${{ env[format('OS_{0}', matrix.mpy-cross)] }}"
+        echo >> $GITHUB_ENV "EX=$EX"
+        echo >> $GITHUB_ENV "OS=$OS"
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4