Skip to content

Commit 63b0bf9

Browse files
jgillickjgillick
committed
Merge remote-tracking branch 'origin/main' into thunderpack1.2
2 parents 5f0a372 + 2f14609 commit 63b0bf9

152 files changed

Lines changed: 4566 additions & 796 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
test:
17-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-20.04
1818
steps:
1919
- name: Dump GitHub context
2020
env:
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
sudo apt-get install -y eatmydata
3939
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
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
4141
- name: Versions
4242
run: |
4343
gcc --version
@@ -67,8 +67,8 @@ jobs:
6767
- name: mpy Tests
6868
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
6969
working-directory: tests
70-
- name: Stubs
71-
run: make stubs -j2
70+
- name: Build and Validate Stubs
71+
run: make check-stubs -j2
7272
- uses: actions/upload-artifact@v2
7373
with:
7474
name: stubs
@@ -111,12 +111,15 @@ jobs:
111111
with:
112112
name: mpy-cross.static-x64-windows
113113
path: mpy-cross/mpy-cross.static.exe
114-
- name: Upload mpy-cross builds to S3
114+
- name: Upload stubs and mpy-cross builds to S3
115115
run: |
116116
[ -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
117117
[ -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
118118
[ -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
119121
env:
122+
AWS_PAGER: ''
120123
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
121124
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
122125
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
@@ -157,19 +160,21 @@ jobs:
157160
run: |
158161
[ -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
159162
env:
163+
AWS_PAGER: ''
160164
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
161165
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
162166
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
163167

164168

165169
build-arm:
166-
runs-on: ubuntu-18.04
170+
runs-on: ubuntu-20.04
167171
needs: test
168172
strategy:
169173
fail-fast: false
170174
matrix:
171175
board:
172176
- "8086_commander"
177+
- "ADM_B_NRF52840_1"
173178
- "TG-Watch02A"
174179
- "aloriumtech_evo_m51"
175180
- "aramcon_badge_2019"
@@ -360,12 +365,13 @@ jobs:
360365
- name: Upload to S3
361366
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
362367
env:
368+
AWS_PAGER: ''
363369
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
364370
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
365371
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
366372

367373
build-riscv:
368-
runs-on: ubuntu-18.04
374+
runs-on: ubuntu-20.04
369375
needs: test
370376
strategy:
371377
fail-fast: false
@@ -408,23 +414,27 @@ jobs:
408414
- name: Upload to S3
409415
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
410416
env:
417+
AWS_PAGER: ''
411418
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
412419
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
413420
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
414421
build-xtensa:
415-
runs-on: ubuntu-latest
422+
runs-on: ubuntu-20.04
416423
needs: test
417424
strategy:
418425
fail-fast: false
419426
matrix:
420427
board:
428+
- "adafruit_magtag_2.9_grayscale"
421429
- "adafruit_metro_esp32s2"
422430
- "electroniccats_bastwifi"
423431
- "espressif_kaluga_1"
424432
- "espressif_saola_1_wroom"
425433
- "espressif_saola_1_wrover"
426434
- "microdev_micro_s2"
427435
- "muselab_nanoesp32_s2"
436+
- "targett_module_clip_wroom"
437+
- "targett_module_clip_wrover"
428438
- "unexpectedmaker_feathers2"
429439
- "unexpectedmaker_feathers2_prerelease"
430440

@@ -499,6 +509,7 @@ jobs:
499509
- name: Upload to S3
500510
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
501511
env:
512+
AWS_PAGER: ''
502513
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
503514
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
504515
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
website:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Dump GitHub context
1616
env:

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@
152152
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
153153
[submodule "ports/esp32s2/esp-idf"]
154154
path = ports/esp32s2/esp-idf
155-
url = https://github.com/espressif/esp-idf.git
155+
url = https://github.com/jepler/esp-idf.git

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT
66

77
# Contributing
88
Please note that this project is released with a
9-
[Contributor Code of Conduct](https://github.com/adafruit/circuitpython/blob/main/CODE_OF_CONDUCT.md).
9+
[Contributor Code of Conduct](CODE_OF_CONDUCT.md).
1010
By participating in this project you agree to abide by its terms. Participation
1111
covers any forum used to converse about CircuitPython including unofficial and official spaces. Failure to do
1212
so will result in corrective actions such as time out or ban from the project.

‎README.rst‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ Differences from `MicroPython <https://github.com/micropython/micropython>`__
9595
CircuitPython:
9696

9797
- Supports native USB on all boards, allowing file editing without special tools.
98-
- Supports only SAMD21, SAMD51, nRF52840, CXD56, STM32F4 and i.MX RT ports.
9998
- Floats (aka decimals) are enabled for all builds.
10099
- Error messages are translated into 10+ languages.
101100
- Does not support concurrency within Python (including interrupts and threading). Some concurrency
@@ -137,8 +136,8 @@ Behavior
137136
API
138137
~~~
139138

140-
- Unified hardware APIs. Documented
141-
`on ReadTheDocs <https://circuitpython.readthedocs.io/en/latest/shared-bindings/index.html>`_.
139+
- Unified hardware APIs. Documented on
140+
`ReadTheDocs <https://circuitpython.readthedocs.io/en/latest/shared-bindings/index.html>`_.
142141
- API docs are rST within the C files in ``shared-bindings``.
143142
- No ``machine`` API.
144143

@@ -201,14 +200,27 @@ Ports
201200
Ports include the code unique to a microcontroller line and also
202201
variations based on the board.
203202

204-
- ``atmel-samd`` Support for SAMD21 and SAMD51 based boards.
205-
- ``nrf`` Support for the nRF52840 based boards.
206-
- ``unix`` Support for UNIX. Only used for automated testing.
203+
================ ============================================================
204+
Supported Support status
205+
================ ============================================================
206+
atmel-samd ``SAMD21`` stable | ``SAMD51`` stable
207+
cxd56 stable
208+
esp32s2 beta
209+
litex alpha
210+
mimxrt10xx alpha
211+
nrf stable
212+
stm ``F4`` stable | ``others`` beta
213+
unix alpha
214+
================ ============================================================
215+
216+
- ``stable`` Highly unlikely to have bugs or missing functionality.
217+
- ``beta`` Being actively improved but may be missing functionality and have bugs.
218+
- ``alpha`` Will have bugs and missing functionality.
207219

208220
The remaining port directories not listed above are in the repo to maintain compatibility with the
209221
`MicroPython <https://github.com/micropython/micropython>`__ parent project.
210222

211-
`back to top <#circuitpython>`__
223+
`Back to Top <#circuitpython>`__
212224

213225
.. |Build Status| image:: https://github.com/adafruit/circuitpython/workflows/Build%20CI/badge.svg
214226
:target: https://github.com/adafruit/circuitpython/actions?query=branch%3Amain

0 commit comments

Comments
 (0)