Merge upstream micropython master (for m_tracked_realloc and other 1.25-1.29 changes)

.gitattributes

@@ -14,10 +14,12 @@
 *.dxf binary
 *.mpy binary
 *.der binary
+*.bin binary
 
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
+tests/micropython/test_normalize_newlines.py.exp -text
 ports/stm32/pybcdc.inf_template -text
 ports/stm32/usbhost/** -text
 ports/cc3200/hal/aes.c -text

.github/actions/setup_esp32/action.yml

@@ -0,0 +1,47 @@
+name: Setup ESP-IDF for CI
+description: Install ESP-IDF
+inputs:
+  idf_ver:
+    required: true
+    type: string
+  ccache_key:
+    required: true
+    type: string
+
+runs:
+  using: "composite"
+
+  steps:
+  - id: python_ver
+    name: Read the Python version
+    run: echo PYTHON_VER=py$(python --version | cut -d' ' -f2) | tee "${GITHUB_OUTPUT}"
+    shell: bash
+
+  - name: Cached ESP-IDF install
+    id: cache_esp_idf
+    uses: actions/cache@v5
+    with:
+      path: |
+        ./esp-idf/
+        ~/.espressif/
+        !~/.espressif/dist/
+        ~/.cache/pip/
+      # Cache is keyed on both IDF version (from the job) and Python version (from the runner)
+      key: esp-idf-${{ inputs.idf_ver }}-${{ steps.python_ver.outputs.PYTHON_VER }}
+
+  - name: Install ESP-IDF packages
+    if: steps.cache_esp_idf.outputs.cache-hit != 'true'
+    env:
+       IDF_VER: ${{ inputs.idf_ver }}
+    run: tools/ci.sh esp32_idf_setup
+    shell: bash
+
+  - name: ccache
+    uses: hendrikmuhs/ccache-action@v1.2
+    with:
+      key: esp32-${{ inputs.idf_ver }}-${{ inputs.ccache_key }}
+
+  - name: Enable CCache for ESP-IDF
+    run: echo "IDF_CCACHE_ENABLE=1" >> ${GITHUB_ENV}
+    shell: bash
+

.github/pull_request_template.md

@@ -3,7 +3,6 @@
      others can review your Pull Request.
 
      Before submitting, please read:
-     https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md
      https://github.com/micropython/micropython/wiki/ContributorGuidelines
 
      Please check any CI failures that appear after your Pull Request is opened.
@@ -12,16 +11,15 @@
 ### Summary
 
 <!-- Explain the reason for making this change. What problem does the pull request
-     solve, or what improvement does it add? Add links if relevant. -->
-
+     solve, or what improvement does it add? Add links if relevant,
+     especially links to open issues. -->
 
 ### Testing
 
 <!-- Explain what testing you did, and on which boards/ports. If there are
      boards or ports that you couldn't test, please mention this here as well.
 
-     If you leave this empty then your Pull Request may be closed. -->
-
+     If you leave this section empty then your Pull Request may be closed. -->
 
 ### Trade-offs and Alternatives
 
@@ -31,3 +29,20 @@
 
      Delete this heading if not relevant (i.e. small fixes) -->
 
+
+### Generative AI
+
+<!-- Please delete the answer below which doesn't apply, or write your own
+     answer with more details. -->
+
+I did not use generative AI tools when creating this PR.
+
+I used generative AI tools when creating this PR, but a human has checked the
+code and is responsible for the code and the description above.
+
+<!-- We require everyone to answer this question. If you delete this section or
+     ignore it then your PR may be closed.
+
+     For more information, consult the MicroPython Generative AI Policy:
+     https://github.com/micropython/micropython/wiki/ContributorGuidelines#generative-ai-policy
+     -->

.github/workflows/biome.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Setup Biome
       uses: biomejs/setup-biome@v2
       with:

.github/workflows/code_formatting.yml

@@ -10,11 +10,11 @@ jobs:
   code-formatting:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
     - name: Install packages
-      run: source tools/ci.sh && ci_c_code_formatting_setup
+      run: tools/ci.sh c_code_formatting_setup
     - name: Run code formatting
-      run: source tools/ci.sh && ci_c_code_formatting_run
+      run: tools/ci.sh c_code_formatting_run
     - name: Check code formatting
       run: git diff --exit-code

.github/workflows/code_size.yml

@@ -1,7 +1,6 @@
 name: Check code size
 
 on:
-  push:
   pull_request:
     paths:
       - '.github/workflows/*.yml'
@@ -11,6 +10,7 @@ on:
       - 'shared/**'
       - 'lib/**'
       - 'ports/bare-arm/**'
+      - 'ports/esp32/**'
       - 'ports/mimxrt/**'
       - 'ports/minimal/**'
       - 'ports/rp2/**'
@@ -24,25 +24,38 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 100
     - name: Install packages
-      run: source tools/ci.sh && ci_code_size_setup
+      run: tools/ci.sh code_size_setup
+
+    - name: Find IDF_NEWEST_VER
+      id: idf_ver
+      run: |
+          echo "IDF_VER="$(yq .env.IDF_NEWEST_VER < .github/workflows/ports_esp32.yml) \
+          | tee "${GITHUB_OUTPUT}"
+
+    - name: Setup ESP-IDF
+      uses: ./.github/actions/setup_esp32
+      with:
+        idf_ver: ${{ steps.idf_ver.outputs.IDF_VER }}
+        ccache_key: code_size
+
     - name: Build
-      run: source tools/ci.sh && ci_code_size_build
+      run: tools/ci.sh code_size_build
     - name: Compute code size difference
-      run: tools/metrics.py diff ~/size0 ~/size1 | tee diff
+      run: source tools/ci.sh && ci_code_size_report
     - name: Save PR number
       if: github.event_name == 'pull_request'
       env:
         PR_NUMBER: ${{ github.event.number }}
       run: echo $PR_NUMBER > pr_number
     - name: Upload diff
       if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: code-size-report
         path: |

.github/workflows/code_size_comment.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: download-artifact
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |
@@ -56,7 +56,7 @@ jobs:
         run: unzip code-size-report.zip
       - name: Post comment to pull request
         if: steps.download-artifact.outputs.result == 'ok'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.github/workflows/codespell.yml

@@ -6,8 +6,13 @@ jobs:
   codespell:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     # codespell version should be kept in sync with .pre-commit-config.yml
-    - run: pip install --user codespell==2.2.6 tomli
+    - run: pip install --user codespell==2.4.1 tomli
     - run: codespell
-
+    # additionally check for misspelling of "MicroPython"
+    - run: |
+        if git grep -n Micropython -- ":(exclude).github/workflows/codespell.yml"; then
+            echo "Please correct capitalisation of MicroPython on the above lines"
+            exit 1
+        fi

.github/workflows/commit_formatting.yml

@@ -1,6 +1,6 @@
 name: Check commit message formatting
 
-on: [push, pull_request]
+on: [pull_request]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
-        fetch-depth: '100'
-    - uses: actions/setup-python@v5
+        fetch-depth: 100
+    - uses: actions/setup-python@v6
     - name: Check commit message formatting
-      run: source tools/ci.sh && ci_commit_formatting_run
+      run: tools/ci.sh commit_formatting_run

.github/workflows/docs.yml

@@ -5,6 +5,8 @@ on:
   pull_request:
     paths:
       - docs/**
+      - py/**
+      - tests/cpydiff/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,9 +17,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
     - name: Install Python packages
       run: pip install -r docs/requirements.txt
+    - name: Build unix port
+      run: tools/ci.sh unix_build_helper
     - name: Build docs
       run: make -C docs/ html

.github/workflows/examples.yml

@@ -18,8 +18,6 @@ jobs:
   embedding:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Build
-      run: make -C examples/embedding -f micropython_embed.mk && make -C examples/embedding
-    - name: Run
-      run: ./examples/embedding/embed | grep "hello world"
+      run: tools/ci.sh embedding_build

.github/workflows/mpremote.yml

@@ -11,18 +11,28 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         # Setting this to zero means fetch all history and tags,
         # which hatch-vcs can use to discover the version tag.
         fetch-depth: 0
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
     - name: Install build tools
       run: pip install build
     - name: Build mpremote wheel
-      run: cd tools/mpremote && python -m build --wheel
+      run: |
+        if ! git rev-parse --verify -q v1.23.0 >/dev/null; then
+          echo "::error::mpremote wheel build requires recent MicroPython version tags in the forked repo."
+          echo ""
+          echo "To fix, push tags from upstream:"
+          echo "  git remote add upstream https://github.com/micropython/micropython.git"
+          echo "  git fetch upstream --tags"
+          echo "  git push origin --tags"
+          exit 1
+        fi
+        cd tools/mpremote && python -m build --wheel
     - name: Archive mpremote wheel
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: mpremote
         path: |

.github/workflows/mpy_format.yml

@@ -6,6 +6,8 @@ on:
     paths:
       - '.github/workflows/*.yml'
       - 'examples/**'
+      - 'mpy-cross/**'
+      - 'py/**'
       - 'tests/**'
       - 'tools/**'
 
@@ -15,10 +17,12 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04 # use 20.04 to get python2
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Install packages
-      run: source tools/ci.sh && ci_mpy_format_setup
+      run: tools/ci.sh mpy_format_setup
     - name: Test mpy-tool.py
-      run: source tools/ci.sh && ci_mpy_format_test
+      run: tools/ci.sh mpy_format_test
+    - name: Test mpy-cross debug emitter
+      run: tools/ci.sh mpy_cross_debug_emitter

.github/workflows/ports.yml

@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Build ports download metadata
       run: mkdir boards && ./tools/autobuild/build-downloads.py . ./boards

.github/workflows/ports_alif.yml

@@ -0,0 +1,33 @@
+name: alif port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'shared/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/alif/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_alif:
+    strategy:
+      fail-fast: false
+      matrix:
+        ci_func:  # names are functions in ci.sh
+          - alif_ae3_build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - name: Install packages
+      run: tools/ci.sh alif_setup
+    - name: Build ci_${{matrix.ci_func }}
+      run: tools/ci.sh ${{ matrix.ci_func }}

.github/workflows/ports_cc3200.yml

@@ -21,8 +21,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Install packages
-      run: source tools/ci.sh && ci_cc3200_setup
+      run: tools/ci.sh cc3200_setup
     - name: Build
-      run: source tools/ci.sh && ci_cc3200_build
+      run: tools/ci.sh cc3200_build