Skip to content

Commit b1bcd90

Browse files
AxeiaAxeia
committed
2 parents 2d4702c + 07bb1a6 commit b1bcd90

File tree

757 files changed

+15669
-10146
lines changed

Some content is hidden

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

757 files changed

+15669
-10146
lines changed

‎.codespell/ignore-words.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ numer
2424
arithmetics
2525
ftbfs
2626
straightaway
27+
ftbs
28+
ftb

‎.git-blame-ignore-revs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
#all: Reformat remaining C code that doesn't have a space after a comma.
1+
# top: Update Python formatting to black "2023 stable style".
2+
8b2748269244304854b3462cb8902952b4dcb892
3+
4+
# all: Reformat remaining C code that doesn't have a space after a comma.
25
5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d
36

47
# ports: Reformat more C and Python source code.

‎.github/actions/mpy_cross/action.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ inputs:
55
required: false
66
default: true
77
type: boolean
8+
cp-version:
9+
required: true
10+
type: string
811

912
runs:
1013
using: composite
@@ -16,22 +19,24 @@ runs:
1619
uses: actions/download-artifact@v3
1720
with:
1821
name: mpy-cross
19-
path: mpy-cross
22+
path: mpy-cross/build
2023

2124
- name: Make mpy-cross executable
2225
if: inputs.download == 'true' && steps.download-mpy-cross.outcome == 'success'
23-
run: sudo chmod +x mpy-cross/mpy-cross
26+
run: sudo chmod +x mpy-cross/build/mpy-cross
2427
shell: bash
2528

2629
- name: Build mpy-cross
2730
if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
2831
run: make -C mpy-cross -j2
2932
shell: bash
33+
env:
34+
CP_VERSION: ${{ inputs.cp-version }}
3035

3136
- name: Upload mpy-cross
3237
if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
3338
continue-on-error: true
3439
uses: actions/upload-artifact@v3
3540
with:
3641
name: mpy-cross
37-
path: mpy-cross/mpy-cross
42+
path: mpy-cross/build/mpy-cross

‎.github/workflows/build-boards.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
- name: Set up mpy-cross
5050
if: steps.set-up-submodules.outputs.frozen == 'True'
5151
uses: ./.github/actions/mpy_cross
52+
with:
53+
cp-version: ${{ inputs.cp-version }}
5254

5355
- name: Versions
5456
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ jobs:
6464
uses: actions/upload-artifact@v3
6565
with:
6666
name: mpy-cross.${{ env.EX }}
67-
path: mpy-cross/mpy-cross.${{ env.EX }}
67+
path: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}
6868
- name: Upload to S3
6969
uses: ./.github/actions/upload_aws
7070
with:
71-
source: mpy-cross/mpy-cross.${{ env.EX }}
71+
source: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}
7272
destination: mpy-cross/${{ env.OS }}/mpy-cross-${{ env.OS }}-${{ env.CP_VERSION }}.${{ env.EX }}
7373
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
7474
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

‎.github/workflows/build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
- name: Set up mpy-cross
5252
uses: ./.github/actions/mpy_cross
5353
with:
54+
cp-version: ${{ steps.set-up-submodules.outputs.version }}
5455
download: false
5556
- name: Get last commit with checks
5657
id: get-last-commit-with-checks
@@ -127,15 +128,15 @@ jobs:
127128
- uses: actions/upload-artifact@v3
128129
with:
129130
name: mpy-cross-macos-11-x64
130-
path: mpy-cross/mpy-cross
131+
path: mpy-cross/build/mpy-cross
131132
- name: Build mpy-cross (arm64)
132133
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
133134
- uses: actions/upload-artifact@v3
134135
with:
135136
name: mpy-cross-macos-11-arm64
136-
path: mpy-cross/mpy-cross-arm64
137+
path: mpy-cross/build-arm64/mpy-cross-arm64
137138
- name: Make universal binary
138-
run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
139+
run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
139140
- name: Upload artifact
140141
uses: actions/upload-artifact@v3
141142
with:
@@ -147,8 +148,8 @@ jobs:
147148
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
148149
run: |
149150
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
150-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
151-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
151+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build-arm64/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
152+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
152153
env:
153154
AWS_PAGER: ''
154155
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
if: steps.set-up-submodules.outputs.frozen == 'True'
6666
uses: ./.github/actions/mpy_cross
6767
with:
68+
cp-version: ${{ steps.set-up-submodules.outputs.version }}
6869
download: false
6970
- name: Versions
7071
run: |

‎.github/workflows/run-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
env:
1818
CP_VERSION: ${{ inputs.cp-version }}
1919
MICROPY_CPYTHON3: python3.8
20-
MICROPY_MICROPYTHON: ../ports/unix/micropython-coverage
20+
MICROPY_MICROPYTHON: ../ports/unix/build-coverage/micropython
2121
TEST_all:
2222
TEST_mpy: --via-mpy -d basics float micropython
2323
TEST_native: --emit native
@@ -41,6 +41,8 @@ jobs:
4141
uses: ./.github/actions/deps/external
4242
- name: Set up mpy-cross
4343
uses: ./.github/actions/mpy_cross
44+
with:
45+
cp-version: ${{ inputs.cp-version }}
4446
- name: Build unix port
4547
run: make -C ports/unix VARIANT=coverage -j2
4648
- name: Run tests

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,9 @@
345345
path = ports/raspberrypi/lib/Pico-PIO-USB
346346
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
347347
branch = main
348+
[submodule "lib/micropython-lib"]
349+
path = lib/micropython-lib
350+
url = https://github.com/micropython/micropython-lib.git
348351
[submodule "lib/certificates"]
349352
path = lib/certificates
350353
url = https://github.com/adafruit/certificates

‎.pre-commit-config.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ repos:
1919
exclude: |
2020
(?x)^(
2121
locale/|
22-
lib/
22+
lib/|
23+
tests/unicode/data/utf-8_invalid.txt|
24+
tests/extmod/data/qr.pgm|
25+
tests/basics/bytearray_byte_operations.py
2326
)
2427
- repo: local
2528
hooks:

0 commit comments

Comments
 (0)