Skip to content

Commit 21c8ac9

Browse files
gamblor21gamblor21
authored
Merge branch 'main' into is31pixelbuf
2 parents 563d8f2 + 4d0e1d9 commit 21c8ac9

456 files changed

Lines changed: 14304 additions & 2465 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: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
with:
3131
submodules: false
3232
fetch-depth: 1
33-
- name: Set up Python 3.8
34-
uses: actions/setup-python@v1
33+
- name: Set up Python 3
34+
uses: actions/setup-python@v2
3535
with:
36-
python-version: 3.8
36+
python-version: "3.x"
3737
- name: Get CP deps
3838
run: python tools/ci_fetch_deps.py test ${{ github.sha }}
3939
- name: CircuitPython version
@@ -136,10 +136,10 @@ jobs:
136136
with:
137137
submodules: false
138138
fetch-depth: 1
139-
- name: Set up Python 3.8
140-
uses: actions/setup-python@v1
139+
- name: Set up Python 3
140+
uses: actions/setup-python@v2
141141
with:
142-
python-version: 3.8
142+
python-version: "3.x"
143143
- name: Get CP deps
144144
run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
145145
- name: CircuitPython version
@@ -202,10 +202,10 @@ jobs:
202202
run: |
203203
git describe --dirty --tags
204204
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
205-
- name: Set up Python 3.8
206-
uses: actions/setup-python@v1
205+
- name: Set up Python 3
206+
uses: actions/setup-python@v2
207207
with:
208-
python-version: 3.8
208+
python-version: "3.x"
209209
- name: Install dependencies
210210
run: |
211211
sudo apt-get update
@@ -241,7 +241,7 @@ jobs:
241241
zip -9r circuitpython-stubs.zip circuitpython-stubs
242242
[ -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
243243
- name: Upload stubs to PyPi
244-
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'))
244+
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')
245245
env:
246246
TWINE_USERNAME: ${{ secrets.pypi_username }}
247247
TWINE_PASSWORD: ${{ secrets.pypi_password }}
@@ -260,10 +260,10 @@ jobs:
260260
board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
261261
if: ${{ needs.test.outputs.boards-arm != '[]' }}
262262
steps:
263-
- name: Set up Python 3.8
264-
uses: actions/setup-python@v1
263+
- name: Set up Python 3
264+
uses: actions/setup-python@v2
265265
with:
266-
python-version: 3.8
266+
python-version: "3.x"
267267
- uses: actions/checkout@v2.2.0
268268
with:
269269
submodules: false
@@ -312,10 +312,10 @@ jobs:
312312
board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
313313
if: ${{ needs.test.outputs.boards-riscv != '[]' }}
314314
steps:
315-
- name: Set up Python 3.8
316-
uses: actions/setup-python@v1
315+
- name: Set up Python 3
316+
uses: actions/setup-python@v2
317317
with:
318-
python-version: 3.8
318+
python-version: "3.x"
319319
- uses: actions/checkout@v2.2.0
320320
with:
321321
submodules: false
@@ -364,10 +364,10 @@ jobs:
364364
board: ${{ fromJSON(needs.test.outputs.boards-espressif) }}
365365
if: ${{ needs.test.outputs.boards-espressif != '[]' }}
366366
steps:
367-
- name: Set up Python 3.8
368-
uses: actions/setup-python@v1
367+
- name: Set up Python 3
368+
uses: actions/setup-python@v2
369369
with:
370-
python-version: 3.8
370+
python-version: "3.x"
371371
- uses: actions/checkout@v2.2.0
372372
with:
373373
submodules: false
@@ -451,10 +451,10 @@ jobs:
451451
board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
452452
if: ${{ needs.test.outputs.boards-aarch != '[]' }}
453453
steps:
454-
- name: Set up Python 3.8
455-
uses: actions/setup-python@v1
454+
- name: Set up Python 3
455+
uses: actions/setup-python@v2
456456
with:
457-
python-version: 3.8
457+
python-version: "3.x"
458458
- uses: actions/checkout@v2.2.0
459459
with:
460460
submodules: false

‎.github/workflows/create_website_pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
submodules: false
2222
fetch-depth: 1
23-
- name: Set up Python 3.8
24-
uses: actions/setup-python@v1
23+
- name: Set up Python 3
24+
uses: actions/setup-python@v2
2525
with:
26-
python-version: 3.8
26+
python-version: "3.x"
2727
- name: Get CP deps
2828
run: python tools/ci_fetch_deps.py website ${{ github.sha }}
2929
- name: Install deps

‎.github/workflows/notify.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Notify users based on issue labels
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
jobs:
8+
notify:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: jenschelkopf/issue-label-notification-action@1.3
12+
with:
13+
recipients: |
14+
ulab=@v923z

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- uses: actions/checkout@v2.2.0
16-
- uses: actions/setup-python@v1
16+
- name: Set up Python 3
17+
uses: actions/setup-python@v2
18+
with:
19+
python-version: "3.x"
1720
- name: Install deps
1821
run: |
1922
sudo apt-add-repository -y -u ppa:pybricks/ppa

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@
148148
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
149149
[submodule "ports/espressif/esp-idf"]
150150
path = ports/espressif/esp-idf
151-
url = https://github.com/espressif/esp-idf.git
152-
branch = release/v4.3
151+
url = https://github.com/adafruit/esp-idf.git
152+
branch = release/v4.4
153153
[submodule "ports/espressif/certificates/nina-fw"]
154154
path = ports/espressif/certificates/nina-fw
155155
url = https://github.com/adafruit/nina-fw.git

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
repos:
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v2.3.0
7+
rev: v4.0.1
88
hooks:
99
- id: check-yaml
1010
- id: end-of-file-fixer

‎.readthedocs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ version: 2
1111
build:
1212
os: ubuntu-20.04
1313
tools:
14-
python: "3.9"
14+
python: "3"
1515

1616
submodules:
1717
include:
@@ -22,4 +22,4 @@ formats:
2222

2323
python:
2424
install:
25-
- requirements: docs/requirements.txt
25+
- requirements: requirements-doc.txt

‎BUILDING.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ https://learn.adafruit.com/building-circuitpython/
1515

1616
## Setup
1717

18-
Please ensure you setup your build environment appropriately, as per the guide. You will need:
18+
Please ensure you set up your build environment appropriately, as per the guide. You will need:
1919

2020
* Linux: https://learn.adafruit.com/building-circuitpython/linux
2121
* MacOS: https://learn.adafruit.com/building-circuitpython/macos
@@ -25,8 +25,9 @@ Please ensure you setup your build environment appropriately, as per the guide.
2525

2626
This project has a bunch of git submodules. You will need to update them regularly.
2727

28-
git submodule sync
29-
git submodule update --init
28+
In the root folder of the CircuitPython repository, execute the following:
29+
30+
make fetch-submodules
3031

3132
### Required Python Packages
3233

@@ -100,7 +101,7 @@ We apply code quality checks using pre-commit. Install pre-commit once per syst
100101

101102
Activate it once per git clone with
102103

103-
pre-commit --install
104+
pre-commit install
104105

105106
Pre-commit also requires some additional programs to be installed through your package manager:
106107

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Supported Support status
213213
================ ============================================================
214214
atmel-samd ``SAMD21`` stable | ``SAMD51`` stable
215215
cxd56 stable
216-
espressif ``ESP32-C3`` beta | ``ESP32-S2`` stable
216+
espressif ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
217217
litex alpha
218218
mimxrt10xx alpha
219219
nrf stable
@@ -229,7 +229,7 @@ unix alpha
229229
Boards
230230
~~~~~~
231231

232-
- Each ``port`` has a ``boards`` directory containing variations of boards
232+
- Each ``port`` has a ``boards`` directory containing boards
233233
which belong to a specific microcontroller line.
234234
- A list of native modules supported by a particular board can be found
235235
`here <https://circuitpython.readthedocs.io/en/latest/shared-bindings/support_matrix.html>`__.

‎data/nvm.toml‎

0 commit comments

Comments
 (0)