Merge pull request #8481 from dhalbert/v1.20-merge

Merge from MicroPython v1.20.0

Author: dhalbert

.codespell/ignore-words.txt

@@ -24,3 +24,5 @@ numer
 arithmetics
 ftbfs
 straightaway
+ftbs
+ftb

.git-blame-ignore-revs

@@ -1,4 +1,7 @@
-#all: Reformat remaining C code that doesn't have a space after a comma.
+# top: Update Python formatting to black "2023 stable style".
+8b2748269244304854b3462cb8902952b4dcb892
+
+# all: Reformat remaining C code that doesn't have a space after a comma.
 5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d
 
 # ports: Reformat more C and Python source code.

.github/actions/mpy_cross/action.yml

@@ -5,6 +5,9 @@ inputs:
     required: false
     default: true
     type: boolean
+  cp-version:
+    required: true
+    type: string
 
 runs:
   using: composite
@@ -16,22 +19,24 @@ runs:
       uses: actions/download-artifact@v3
       with:
         name: mpy-cross
-        path: mpy-cross
+        path: mpy-cross/build
 
     - name: Make mpy-cross executable
       if: inputs.download == 'true' && steps.download-mpy-cross.outcome == 'success'
-      run: sudo chmod +x mpy-cross/mpy-cross
+      run: sudo chmod +x mpy-cross/build/mpy-cross
       shell: bash
 
     - name: Build mpy-cross
       if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
       run: make -C mpy-cross -j2
       shell: bash
+      env:
+        CP_VERSION: ${{ inputs.cp-version }}
 
     - name: Upload mpy-cross
       if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
       continue-on-error: true
       uses: actions/upload-artifact@v3
       with:
         name: mpy-cross
-        path: mpy-cross/mpy-cross
+        path: mpy-cross/build/mpy-cross

.github/workflows/build-boards.yml

@@ -49,6 +49,8 @@ jobs:
     - name: Set up mpy-cross
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross
+      with:
+        cp-version: ${{ inputs.cp-version }}
 
     - name: Versions
       run: |

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

@@ -64,11 +64,11 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: mpy-cross.${{ env.EX }}
-        path: mpy-cross/mpy-cross.${{ env.EX }}
+        path: mpy-cross/build-${{ env.EX}}/mpy-cross.${{ env.EX }}
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
       with:
-        source: mpy-cross/mpy-cross.${{ env.EX }}
+        source: mpy-cross/build-${{ env.EX}}/mpy-cross.${{ env.EX }}
         destination: mpy-cross/${{ env.OS }}/mpy-cross-${{ env.OS }}-${{ env.CP_VERSION }}.${{ env.EX }}
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/build.yml

@@ -51,6 +51,7 @@ jobs:
     - name: Set up mpy-cross
       uses: ./.github/actions/mpy_cross
       with:
+        cp-version: ${{ steps.set-up-submodules.outputs.version }}
         download: false
     - name: Get last commit with checks
       id: get-last-commit-with-checks
@@ -127,15 +128,15 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross-macos-11-x64
-        path: mpy-cross/mpy-cross
+        path: mpy-cross/build/mpy-cross
     - name: Build mpy-cross (arm64)
       run: make -C mpy-cross -j2 -f Makefile.m1 V=2
     - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross-macos-11-arm64
-        path: mpy-cross/mpy-cross-arm64
+        path: mpy-cross/build-arm64/mpy-cross-arm64
     - name: Make universal binary
-      run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
+      run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:

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

@@ -65,6 +65,7 @@ jobs:
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross
       with:
+        cp-version: ${{ steps.set-up-submodules.outputs.version }}
         download: false
     - name: Versions
       run: |

.github/workflows/run-tests.yml

@@ -17,7 +17,7 @@ jobs:
     env:
       CP_VERSION: ${{ inputs.cp-version }}
       MICROPY_CPYTHON3: python3.8
-      MICROPY_MICROPYTHON: ../ports/unix/micropython-coverage
+      MICROPY_MICROPYTHON: ../ports/unix/build-coverage/micropython
       TEST_all:
       TEST_mpy: --via-mpy -d basics float micropython
       TEST_native: --emit native
@@ -41,6 +41,8 @@ jobs:
       uses: ./.github/actions/deps/external
     - name: Set up mpy-cross
       uses: ./.github/actions/mpy_cross
+      with:
+        cp-version: ${{ inputs.cp-version }}
     - name: Build unix port
       run: make -C ports/unix VARIANT=coverage -j2
     - name: Run tests

.gitmodules

@@ -345,6 +345,9 @@
 	path = ports/raspberrypi/lib/Pico-PIO-USB
 	url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
 	branch = main
+[submodule "lib/micropython-lib"]
+	path = lib/micropython-lib
+	url = https://github.com/micropython/micropython-lib.git
 [submodule "lib/certificates"]
 	path = lib/certificates
 	url = https://github.com/adafruit/certificates

.pre-commit-config.yaml

@@ -19,7 +19,10 @@ repos:
         exclude: |
           (?x)^(
             locale/|
-            lib/
+            lib/|
+            tests/unicode/data/utf-8_invalid.txt|
+            tests/extmod/data/qr.pgm|
+            tests/basics/bytearray_byte_operations.py
           )
 -   repo: local
     hooks: