Skip to content

Commit cda8db2

Browse files
syntheticfuturesyntheticfuture
committed
Updating to latest CircuitPython
2 parents c011079 + e14b148 commit cda8db2

File tree

1,648 files changed

+92204
-14733
lines changed

Some content is hidden

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

1,648 files changed

+92204
-14733
lines changed

‎.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
# Per default everything gets normalized and gets LF line endings on checkout.
26
* text eol=lf
37

‎.github/workflows/build.yml

Lines changed: 103 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
name: Build CI
26

37
on:
@@ -10,7 +14,7 @@ on:
1014

1115
jobs:
1216
test:
13-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-20.04
1418
steps:
1519
- name: Dump GitHub context
1620
env:
@@ -22,16 +26,18 @@ jobs:
2226
fetch-depth: 0
2327
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
2428
- name: CircuitPython version
25-
run: git describe --dirty --tags
29+
run: |
30+
git describe --dirty --tags
31+
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
2632
- name: Set up Python 3.8
2733
uses: actions/setup-python@v1
2834
with:
2935
python-version: 3.8
3036
- name: Install deps
3137
run: |
3238
sudo apt-get install -y eatmydata
33-
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
34-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid
39+
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 latexmk texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
40+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli mypy
3541
- name: Versions
3642
run: |
3743
gcc --version
@@ -61,43 +67,63 @@ jobs:
6167
- name: mpy Tests
6268
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
6369
working-directory: tests
64-
- name: Stubs
65-
run: make stubs -j2
70+
- name: Build and Validate Stubs
71+
run: make check-stubs -j2
6672
- uses: actions/upload-artifact@v2
6773
with:
6874
name: stubs
6975
path: circuitpython-stubs*
70-
- name: Docs
71-
run: sphinx-build -E -W -b html . _build/html
76+
- name: Test Documentation Build (HTML)
77+
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
7278
- uses: actions/upload-artifact@v2
7379
with:
7480
name: docs
7581
path: _build/html
82+
- name: Test Documentation Build (LaTeX/PDF)
83+
run: |
84+
make latexpdf
85+
- uses: actions/upload-artifact@v2
86+
with:
87+
name: docs
88+
path: _build/latex
7689
- name: Translations
7790
run: make check-translate
7891
- name: New boards check
7992
run: python3 -u ci_new_boards_check.py
8093
working-directory: tools
94+
- name: Duplicate USB VID/PID Check
95+
run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
8196
- name: Build mpy-cross.static-raspbian
8297
run: make -C mpy-cross -j2 -f Makefile.static-raspbian
83-
- uses: actions/upload-artifact@v1.0.0
98+
- uses: actions/upload-artifact@v2
8499
with:
85100
name: mpy-cross.static-raspbian
86101
path: mpy-cross/mpy-cross.static-raspbian
87-
88102
- name: Build mpy-cross.static
89103
run: make -C mpy-cross -j2 -f Makefile.static
90-
- uses: actions/upload-artifact@v1.0.0
104+
- uses: actions/upload-artifact@v2
91105
with:
92106
name: mpy-cross.static-amd64-linux
93107
path: mpy-cross/mpy-cross.static
94-
95108
- name: Build mpy-cross.static-mingw
96109
run: make -C mpy-cross -j2 -f Makefile.static-mingw
97-
- uses: actions/upload-artifact@v1.0.0
110+
- uses: actions/upload-artifact@v2
98111
with:
99112
name: mpy-cross.static-x64-windows
100113
path: mpy-cross/mpy-cross.static.exe
114+
- name: Upload stubs and mpy-cross builds to S3
115+
run: |
116+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
117+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
118+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
119+
zip -9r circuitpython-stubs.zip circuitpython-stubs
120+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs.zip s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
121+
env:
122+
AWS_PAGER: ''
123+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
124+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
125+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
126+
101127

102128
mpy-cross-mac:
103129
runs-on: macos-10.15
@@ -106,10 +132,10 @@ jobs:
106132
env:
107133
GITHUB_CONTEXT: ${{ toJson(github) }}
108134
run: echo "$GITHUB_CONTEXT"
109-
- name: Make gettext programs available
135+
- name: Install dependencies
110136
run: |
111137
brew install gettext
112-
echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
138+
echo >>$GITHUB_PATH /usr/local/opt/gettext/bin
113139
- name: Versions
114140
run: |
115141
gcc --version
@@ -121,22 +147,34 @@ jobs:
121147
fetch-depth: 0
122148
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
123149
- name: CircuitPython version
124-
run: git describe --dirty --tags
150+
run: |
151+
git describe --dirty --tags
152+
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
125153
- name: Build mpy-cross
126154
run: make -C mpy-cross -j2
127-
- uses: actions/upload-artifact@v1.0.0
155+
- uses: actions/upload-artifact@v2
128156
with:
129157
name: mpy-cross-macos-catalina
130158
path: mpy-cross/mpy-cross
159+
- name: Upload mpy-cross build to S3
160+
run: |
161+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-catalina-${{ env.CP_VERSION }} --no-progress --region us-east-1
162+
env:
163+
AWS_PAGER: ''
164+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
165+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
166+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
167+
131168

132169
build-arm:
133-
runs-on: ubuntu-18.04
170+
runs-on: ubuntu-20.04
134171
needs: test
135172
strategy:
136173
fail-fast: false
137174
matrix:
138175
board:
139176
- "8086_commander"
177+
- "ADM_B_NRF52840_1"
140178
- "TG-Watch02A"
141179
- "aloriumtech_evo_m51"
142180
- "aramcon_badge_2019"
@@ -146,7 +184,10 @@ jobs:
146184
- "arduino_nano_33_iot"
147185
- "arduino_zero"
148186
- "bast_pro_mini_m0"
149-
- "bdmicro_vina_m0"
187+
- "bdmicro_vina_d21"
188+
- "bdmicro_vina_d51"
189+
- "bless_dev_board_multi_sensor"
190+
- "blm_badge"
150191
- "capablerobot_usbhub"
151192
- "catwan_usbstick"
152193
- "circuitbrains_basic_m0"
@@ -157,11 +198,15 @@ jobs:
157198
- "circuitplayground_express_displayio"
158199
- "clue_nrf52840_express"
159200
- "cp32-m4"
201+
- "cp_sapling_m0"
202+
- "cp_sapling_m0_spiflash"
160203
- "datalore_ip_m4"
161204
- "datum_distance"
162205
- "datum_imu"
163206
- "datum_light"
164207
- "datum_weather"
208+
- "dynossat_edu_eps"
209+
- "dynossat_edu_obc"
165210
- "electronut_labs_blip"
166211
- "electronut_labs_papyr"
167212
- "escornabot_makech"
@@ -175,6 +220,7 @@ jobs:
175220
- "feather_m0_rfm69"
176221
- "feather_m0_rfm9x"
177222
- "feather_m0_supersized"
223+
- "feather_m4_can"
178224
- "feather_m4_express"
179225
- "feather_m7_1011"
180226
- "feather_mimxrt1011"
@@ -188,6 +234,7 @@ jobs:
188234
- "hallowing_m0_express"
189235
- "hallowing_m4_express"
190236
- "hiibot_bluefi"
237+
- "ikigaisense_vita"
191238
- "imxrt1010_evk"
192239
- "imxrt1020_evk"
193240
- "imxrt1060_evk"
@@ -196,17 +243,22 @@ jobs:
196243
- "itsybitsy_nrf52840_express"
197244
- "kicksat-sprite"
198245
- "loc_ber_m4_base_board"
246+
- "makerdiary_m60_keyboard"
247+
- "makerdiary_nrf52840_m2_devkit"
199248
- "makerdiary_nrf52840_mdk"
200249
- "makerdiary_nrf52840_mdk_usb_dongle"
250+
- "matrixportal_m4"
201251
- "meowbit_v121"
202252
- "meowmeow"
203253
- "metro_m0_express"
204254
- "metro_m4_airlift_lite"
205255
- "metro_m4_express"
256+
- "metro_m7_1011"
206257
- "metro_nrf52840_express"
207258
- "mini_sam_m4"
208259
- "monster_m4sk"
209260
- "ndgarage_ndbit6"
261+
- "ndgarage_ndbit6_v2"
210262
- "nfc_copy_cat"
211263
- "nice_nano"
212264
- "nucleo_f746zg"
@@ -223,6 +275,7 @@ jobs:
223275
- "pca10100"
224276
- "pewpew10"
225277
- "pewpew_m4"
278+
- "picoplanet"
226279
- "pirkey_m0"
227280
- "pitaya_go"
228281
- "pyb_nano_v2"
@@ -236,9 +289,13 @@ jobs:
236289
- "pyportal"
237290
- "pyportal_titano"
238291
- "pyruler"
292+
- "qtpy_m0"
293+
- "qtpy_m0_haxpress"
294+
- "raytac_mdbt50q-db-40"
239295
- "robohatmm1_m4"
240296
- "sam32"
241297
- "same54_xplained"
298+
- "seeeduino_wio_terminal"
242299
- "seeeduino_xiao"
243300
- "serpente"
244301
- "shirtty"
@@ -262,7 +319,9 @@ jobs:
262319
- "teensy40"
263320
- "teensy41"
264321
- "teknikio_bluebird"
265-
- "thunderpack"
322+
- "thunderpack_v11"
323+
- "thunderpack_v12"
324+
- "tinkeringtech_scoutmakes_azul"
266325
- "trellis_m4_express"
267326
- "trinket_m0"
268327
- "trinket_m0_haxpress"
@@ -302,19 +361,20 @@ jobs:
302361
working-directory: tools
303362
env:
304363
BOARDS: ${{ matrix.board }}
305-
- uses: actions/upload-artifact@v1.0.0
364+
- uses: actions/upload-artifact@v2
306365
with:
307366
name: ${{ matrix.board }}
308367
path: bin/${{ matrix.board }}
309368
- name: Upload to S3
310369
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
311370
env:
371+
AWS_PAGER: ''
312372
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
313373
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
314374
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
315375

316376
build-riscv:
317-
runs-on: ubuntu-18.04
377+
runs-on: ubuntu-20.04
318378
needs: test
319379
strategy:
320380
fail-fast: false
@@ -350,25 +410,36 @@ jobs:
350410
working-directory: tools
351411
env:
352412
BOARDS: ${{ matrix.board }}
353-
- uses: actions/upload-artifact@v1.0.0
413+
- uses: actions/upload-artifact@v2
354414
with:
355415
name: ${{ matrix.board }}
356416
path: bin/${{ matrix.board }}
357417
- name: Upload to S3
358418
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
359419
env:
420+
AWS_PAGER: ''
360421
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
361422
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
362423
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
363424
build-xtensa:
364-
runs-on: ubuntu-latest
425+
runs-on: ubuntu-20.04
365426
needs: test
366427
strategy:
367428
fail-fast: false
368429
matrix:
369430
board:
431+
- "adafruit_magtag_2.9_grayscale"
432+
- "adafruit_metro_esp32s2"
433+
- "electroniccats_bastwifi"
434+
- "espressif_kaluga_1"
370435
- "espressif_saola_1_wroom"
371436
- "espressif_saola_1_wrover"
437+
- "microdev_micro_s2"
438+
- "muselab_nanoesp32_s2"
439+
- "targett_module_clip_wroom"
440+
- "targett_module_clip_wrover"
441+
- "unexpectedmaker_feathers2"
442+
- "unexpectedmaker_feathers2_prerelease"
372443

373444
steps:
374445
- name: Set up Python 3.8
@@ -387,7 +458,12 @@ jobs:
387458
id: idf-cache
388459
with:
389460
path: ${{ github.workspace }}/.idf_tools
390-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20200523
461+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20200801
462+
- name: Clone IDF submodules
463+
run: |
464+
(cd $IDF_PATH && git submodule update --init)
465+
env:
466+
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
391467
- name: Install IDF tools
392468
run: |
393469
$IDF_PATH/tools/idf_tools.py --non-interactive install required
@@ -429,13 +505,14 @@ jobs:
429505
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
430506
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
431507
BOARDS: ${{ matrix.board }}
432-
- uses: actions/upload-artifact@v1.0.0
508+
- uses: actions/upload-artifact@v2
433509
with:
434510
name: ${{ matrix.board }}
435511
path: bin/${{ matrix.board }}
436512
- name: Upload to S3
437513
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
438514
env:
515+
AWS_PAGER: ''
439516
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
440517
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
441518
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

‎.github/workflows/create_website_pr.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
name: Update CircuitPython.org
26

37
on:
@@ -6,7 +10,7 @@ on:
610

711
jobs:
812
website:
9-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-20.04
1014
steps:
1115
- name: Dump GitHub context
1216
env:

‎.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ on:
1111

1212
jobs:
1313
pre-commit:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-20.04
1515
steps:
1616
- uses: actions/checkout@v1
1717
- uses: actions/setup-python@v1
1818
- name: set PY
19-
run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
19+
run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
2020
- uses: actions/cache@v1
2121
with:
2222
path: ~/.cache/pre-commit

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy