Skip to content

Commit 7338465

Browse files
tannewttannewt
authored
Merge pull request #9611 from dhalbert/merge-micropython-v1.23.0
Merge micropython v1.23.0
2 parents 64cb762 + 4cbd8ae commit 7338465

File tree

433 files changed

+4638
-5341
lines changed

Some content is hidden

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

433 files changed

+4638
-5341
lines changed

‎.git-blame-ignore-revs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# all: Prune trailing whitespace.
2+
dda9b9c6da5d3c31fa8769e581a753e95a270803
3+
4+
# all: Remove the "STATIC" macro and just use "static" instead.
5+
decf8e6a8bb940d5829ca3296790631fcece7b21
6+
7+
# renesas-ra: Fix spelling mistakes found by codespell.
8+
b3f2f18f927fa2fad10daf63d8c391331f5edf58
9+
110
# all: Update Python formatting to ruff-format.
211
bbd8760bd9a2302e5abee29db279102bb11d7732
312

‎.github/workflows/run-tests.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,16 @@ jobs:
5353
run: ./run-tests.py -j4 --print-failures
5454
if: failure()
5555
working-directory: tests
56-
- name: Build native modules
57-
if: matrix.test == 'all'
58-
run: |
59-
make -C examples/natmod/features1
60-
make -C examples/natmod/features2
61-
make -C examples/natmod/heapq
62-
make -C examples/natmod/random
63-
make -C examples/natmod/re
64-
- name: Test native modules
65-
if: matrix.test == 'all'
66-
run: ./run-natmodtests.py extmod/{heapq*,re*,zlib*}.py
67-
working-directory: tests
56+
# Not working after MicroPython v1.23 merge.
57+
# - name: Build native modules
58+
# if: matrix.test == 'all'
59+
# run: |
60+
# make -C examples/natmod/features1
61+
# make -C examples/natmod/features2
62+
# make -C examples/natmod/heapq
63+
# make -C examples/natmod/random
64+
# make -C examples/natmod/re
65+
# - name: Test native modules
66+
# if: matrix.test == 'all'
67+
# run: ./run-natmodtests.py extmod/{heapq*,random*,re*}.py
68+
# working-directory: tests

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
url = https://github.com/atgreen/libffi
1111
[submodule "lib/berkeley-db-1.xx"]
1212
path = lib/berkeley-db-1.xx
13-
url = https://github.com/pfalcon/berkeley-db-1.xx
13+
url = https://github.com/micropython/berkeley-db-1.xx
1414
[submodule "tools/uf2"]
1515
path = tools/uf2
1616
url = https://github.com/Microsoft/uf2.git

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ THE SOFTWARE.
2222

2323
--------------------------------------------------------------------------------
2424

25-
#CIRCUITPY-CHANGE:
25+
# CIRCUITPY-CHANGE:
2626

2727
Unless specified otherwise (see below), the above license and copyright applies
2828
to all files derived from MicroPython in this repository.

‎LICENSE_MicroPython

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2022 Damien P. George
3+
Copyright (c) 2013-2024 Damien P. George
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -35,9 +35,7 @@ used during the build process and is not part of the compiled source code.
3535

3636
/ (MIT)
3737
/drivers
38-
/cc3000 (BSD-3-clause)
3938
/cc3100 (BSD-3-clause)
40-
/wiznet5k (BSD-3-clause)
4139
/lib
4240
/asf4 (Apache-2.0)
4341
/axtls (BSD-3-clause)
@@ -50,24 +48,31 @@ used during the build process and is not part of the compiled source code.
5048
/cmsis (BSD-3-clause)
5149
/crypto-algorithms (NONE)
5250
/libhydrogen (ISC)
51+
/libmetal (BSD-3-clause)
5352
/littlefs (BSD-3-clause)
5453
/lwip (BSD-3-clause)
5554
/mynewt-nimble (Apache-2.0)
5655
/nrfx (BSD-3-clause)
5756
/nxp_driver (BSD-3-Clause)
5857
/oofatfs (BSD-1-clause)
58+
/open-amp (BSD-3-clause)
5959
/pico-sdk (BSD-3-clause)
6060
/re15 (BSD-3-clause)
6161
/stm32lib (BSD-3-clause)
6262
/tinytest (BSD-3-clause)
6363
/tinyusb (MIT)
6464
/uzlib (Zlib)
65+
/wiznet5k (MIT)
6566
/logo (uses OFL-1.1)
6667
/ports
6768
/cc3200
6869
/hal (BSD-3-clause)
6970
/simplelink (BSD-3-clause)
7071
/FreeRTOS (GPL-2.0 with FreeRTOS exception)
72+
/esp32
73+
/ppp_set_auth.* (Apache-2.0)
74+
/rp2
75+
/mutex_extra.c (BSD-3-clause)
7176
/stm32
7277
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
7378
/stm32_it.* (MIT + BSD-3-clause)
@@ -77,8 +82,6 @@ used during the build process and is not part of the compiled source code.
7782
/*/stm32*.h (BSD-3-clause)
7883
/usbdev (MCD-ST Liberty SW License Agreement V2)
7984
/usbhost (MCD-ST Liberty SW License Agreement V2)
80-
/teensy
81-
/core (PJRC.COM)
8285
/zephyr
8386
/src (Apache-2.0)
8487
/tools

‎docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Adafruit's CircuitPython Documentation
1+
Adafruit CircuitPython Documentation
22
=========================
33

44
The latest documentation can be found at:

‎docs/library/collections.rst

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,37 @@ Classes
3131

3232
- *flag* is optional and can be set to 1 to check for overflow when
3333
adding items. If the deque is full and overflow checking is enabled,
34-
an IndexError will be raised when adding items.
34+
an ``IndexError`` will be raised when adding items.
3535

3636
Deque objects have the following methods:
3737

3838
.. method:: deque.append(x)
3939

4040
Add *x* to the right side of the deque.
41-
Raises IndexError if overflow checking is enabled and there is no more room left.
41+
Raises ``IndexError`` if overflow checking is enabled and there is
42+
no more room in the queue.
4243

4344
.. method:: deque.appendleft(x)
4445

4546
Add *x* to the left side of the deque.
46-
Raises IndexError if overflow checking is enabled and there is no more room left.
47+
Raises ``IndexError`` if overflow checking is enabled and there is
48+
no more room in the queue.
4749

4850
.. method:: deque.pop()
4951

5052
Remove and return an item from the right side of the deque.
51-
Raises IndexError if no items are present.
53+
Raises ``IndexError`` if no items are present.
5254

5355
.. method:: deque.popleft()
5456

5557
Remove and return an item from the left side of the deque.
56-
Raises IndexError if no items are present.
58+
Raises ``IndexError`` if no items are present.
5759

5860
.. method:: deque.extend(iterable)
5961

60-
Extend the right side of the deque by appending items from the *iterable* argument.
62+
Extend the right side of the deque by appending items from the ``iterable`` argument.
6163
Raises IndexError if overflow checking is enabled and there is no more room left
62-
for all of the items in *iterable*.
64+
for all of the items in ``iterable``.
6365

6466
In addition to the above, deques support iteration, ``bool``, ``len(d)``, ``reversed(d)``,
6567
membership testing with the ``in`` operator, and subscript references like ``d[0]``.

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