Skip to content

Commit da149b0

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/main' into stm32-sleepmem
2 parents 696c035 + bfe2978 commit da149b0

File tree

781 files changed

+14023
-8537
lines changed

Some content is hidden

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

781 files changed

+14023
-8537
lines changed

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# tools/gen-cpydiff.py: Fix formatting of doc strings for new Black.
2+
0f78c36c5aa458a954eed39a46942209107a553e
3+
14
# tests/run-tests.py: Reformat with Black.
25
2a38d7103672580882fb621a5b76e8d26805d593
36

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: 🐞 Bug Report
2+
description: Create a bug report to help us improve
3+
labels:
4+
- bug
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: >-
9+
Thanks! for testing out CircuitPython. Now that you have encountered a
10+
bug... you can file a report for it.
11+
- type: textarea
12+
id: firmware
13+
attributes:
14+
label: CircuitPython version
15+
description: >-
16+
Include the version of CircuitPython you're running. You can see it in
17+
the `boot_out.txt` file, as well as in the `REPL`.
18+
placeholder: Adafruit CircuitPython 6.2.0 on 2021-03-01; Raspberry Pi Pico with rp2040
19+
render: python
20+
validations:
21+
required: true
22+
- type: textarea
23+
id: code
24+
attributes:
25+
label: Code/REPL
26+
description: This is automatically rendered as Python, so no need for backticks.
27+
placeholder: |
28+
import busio, bitbangio
29+
i2c = bitbangio.I2C(board.GP1, board.GP0)
30+
render: python
31+
validations:
32+
required: true
33+
- type: textarea
34+
id: behavior
35+
attributes:
36+
label: Behavior
37+
description: What happens when you run the code above? Include error messages (if any).
38+
placeholder: |
39+
```python
40+
Traceback (most recent call last):
41+
File "<stdin>", line 1, in <module>
42+
TimeoutError: Clock stretch too long
43+
```
44+
On-board led pulses red.
45+
validations:
46+
required: true
47+
- type: textarea
48+
id: description
49+
attributes:
50+
label: Description
51+
description: Optionally, describe the bug in more detail.
52+
placeholder: |
53+
- Error while using i2c...
54+
- Only happens when...
55+
- might be related to #4291...
56+
- type: textarea
57+
id: more-info
58+
attributes:
59+
label: Additional information
60+
description: >-
61+
Optionally, add any other information like hardware connection, scope
62+
output etc. If you have already done some debugging, mention it here.
63+
placeholder: Removing [this](url) line resolves the issue.

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
contact_links:
2-
- name: Adafruit Forum
2+
- name: 🔗 Adafruit Forum
33
url: https://forums.adafruit.com/
44
about: Official Adafruit technical support forum. Good for getting help on getting a project working.
5-
- name: Adafruit Discord
5+
- name: 🔗 Adafruit Discord
66
url: https://adafru.it/discord
77
about: Unofficial chat with many helpful folks and normally prompt replies.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
name: Feature request
2+
name: 🚀 Feature Request
33
about: Suggest an idea for this project
44
title: ''
55
labels: 'enhancement'
66
assignees: ''
77

88
---
99

10-
<!-- We are always adding new features and enhancements to CircuitPython 🚀
10+
<!-- We keep adding new features and enhancements to CircuitPython 🚀
1111
and would love ❤ to see what new challenge you have got for us... 🙂 -->

‎.github/workflows/build.yml

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ jobs:
5353
- uses: actions/upload-artifact@v2
5454
with:
5555
name: stubs
56-
path: circuitpython-stubs*
56+
path: circuitpython-stubs/dist/*
57+
- name: Install pypi dependencies
58+
run: |
59+
python -m pip install --upgrade pip
60+
pip install setuptools wheel twine
5761
- name: Test Documentation Build (HTML)
5862
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
5963
- uses: actions/upload-artifact@v2
@@ -108,20 +112,29 @@ jobs:
108112
with:
109113
name: mpy-cross.static-x64-windows
110114
path: mpy-cross/mpy-cross.static.exe
111-
- name: Upload stubs and mpy-cross builds to S3
115+
- name: Upload mpy-cross builds to S3
116+
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
117+
env:
118+
AWS_PAGER: ''
119+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
120+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
112121
run: |
113122
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-aarch64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-aarch64-${{ env.CP_VERSION }} --no-progress --region us-east-1
114123
[ -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
115124
[ -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
116125
[ -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
117126
zip -9r circuitpython-stubs.zip circuitpython-stubs
118-
[ -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
119-
env:
120-
AWS_PAGER: ''
121-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
122-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
123-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
127+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
124128
129+
- name: Upload stubs to PyPi
130+
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit'
131+
env:
132+
TWINE_USERNAME: ${{ secrets.pypi_username }}
133+
TWINE_PASSWORD: ${{ secrets.pypi_password }}
134+
run: |
135+
# setup.py sdist was run by 'make stubs'
136+
[ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
137+
[ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
125138
126139
mpy-cross-mac:
127140
runs-on: macos-10.15
@@ -177,7 +190,7 @@ jobs:
177190
AWS_PAGER: ''
178191
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
179192
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
180-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
193+
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
181194

182195

183196
build-arm:
@@ -285,6 +298,7 @@ jobs:
285298
- "metro_m4_express"
286299
- "metro_m7_1011"
287300
- "metro_nrf52840_express"
301+
- "microbit_v2"
288302
- "mini_sam_m4"
289303
- "monster_m4sk"
290304
- "ndgarage_ndbit6"
@@ -417,7 +431,7 @@ jobs:
417431
AWS_PAGER: ''
418432
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
419433
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
420-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
434+
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
421435

422436
build-riscv:
423437
runs-on: ubuntu-20.04
@@ -468,7 +482,7 @@ jobs:
468482
AWS_PAGER: ''
469483
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
470484
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
471-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
485+
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
472486
build-xtensa:
473487
runs-on: ubuntu-20.04
474488
needs: test
@@ -517,7 +531,7 @@ jobs:
517531
id: idf-cache
518532
with:
519533
path: ${{ github.workspace }}/.idf_tools
520-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210506
534+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210716
521535
- name: Clone IDF submodules
522536
run: |
523537
(cd $IDF_PATH && git submodule update --init)
@@ -576,4 +590,4 @@ jobs:
576590
AWS_PAGER: ''
577591
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
578592
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
579-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
593+
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

‎.github/workflows/ports_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
pip install wheel
6161
# requirements_dev.txt doesn't install on windows. (with msys2 python)
6262
# instead, pick a subset for what we want to do
63-
pip install cascadetoml jinja2 typer
63+
pip install cascadetoml jinja2 typer intelhex
6464
# check that installed packages work....?
6565
which python; python --version; python -c "import cascadetoml"
6666
which python3; python3 --version; python3 -c "import cascadetoml"

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dist/
3333
build/
3434
bin/
3535
circuitpython-stubs/
36+
test-stubs/
3637
build-*/
3738

3839
# Test failure outputs

‎.gitmodules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
[submodule "ports/esp32s2/esp-idf"]
154154
path = ports/esp32s2/esp-idf
155155
url = https://github.com/adafruit/esp-idf.git
156+
branch = circuitpython-v4.3
156157
[submodule "ports/esp32s2/certificates/nina-fw"]
157158
path = ports/esp32s2/certificates/nina-fw
158159
url = https://github.com/adafruit/nina-fw.git
@@ -176,7 +177,7 @@
176177
url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleMath
177178
[submodule "ports/raspberrypi/sdk"]
178179
path = ports/raspberrypi/sdk
179-
url = https://github.com/adafruit/pico-sdk.git
180+
url = https://github.com/raspberrypi/pico-sdk.git
180181
[submodule "data/nvm.toml"]
181182
path = data/nvm.toml
182183
url = https://github.com/adafruit/nvm.toml.git

‎MANIFEST.in-stubs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
recursive-include . *.pyi

0 commit comments

Comments
 (0)