merge from main

Author: dhalbert

.gitattributes

@@ -27,4 +27,4 @@
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
-# CIRCUITPY-CHANGE: remove non-CircuitPython tests
+# CIRCUITPY-CHANGE: remove non-CircuitPython tests

.mailmap

@@ -1,17 +1,36 @@
 # SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
+# SPDX-FileCopyrightText: 2024, Rylie Pavlik
 #
 # SPDX-License-Identifier: Unlicense
 
+Alec Delaney <[email protected]>
+Alec Delaney <[email protected]> <[email protected]>
+Alec Delaney <[email protected]> <[email protected]>
+Alex Sirota <[email protected]>
+Alex Sirota <[email protected]> <[email protected]>
 Alexander Steffen <[email protected]>
 Alexander Steffen <[email protected]> <[email protected]>
 Alexander Steffen <[email protected]> <[email protected]>
+Anson He <[email protected]>
+Ayke van Laethem <[email protected]>
 Benjamin Vernoux <[email protected]>
+BennyE <[email protected]>
+BennyE <[email protected]> <[email protected]>
+Bernhard Bablok <[email protected]>
+Bernhard Boser <[email protected]>
+Bernhard Boser <[email protected]> <[email protected]>
+Bernhard Boser <[email protected]> <[email protected]>
+Bill Sideris <[email protected]>
+Brendan <[email protected]>
 Brent Rubell <[email protected]>
 Brent Rubell <[email protected]> <[email protected]>
 Brent Rubell <[email protected]> <[email protected]>
 Carlos <[email protected]>
+Carter Nelson <[email protected]>
+Chris Dailey <[email protected]>
 Chris Packham <[email protected]>
 Chris Packham <[email protected]> <[email protected]>
+Chris Wilson <[email protected]>
 Damiano Mazzella <[email protected]>
 Damien George <[email protected]>
 Dan Halbert <[email protected]>
@@ -20,45 +39,92 @@ Daniel Pollard <[email protected]>
 Daniel Pollard <[email protected]> <[email protected]>
 Daniel Tralamazza <[email protected]>
 Daniel Tralamazza <[email protected]> <[email protected]>
+DavePutz <[email protected]>
 David Glaude <[email protected]>
 David Glaude <[email protected]> <[email protected]>
+Elvis Pfützenreuter <[email protected]>
+Enrique Casado <[email protected]>
+Enrique Casado <[email protected]> <[email protected]>
+Eva Herrada <[email protected]>
+Eva Herrada <[email protected]> <[email protected]>
+Eva Herrada <[email protected]> <[email protected]>
+Eva Herrada <[email protected]> <[email protected]>
+Eva Herrada <[email protected]> <[email protected]>
+Eva Herrada <[email protected]> dherrada <=>
+Florin Maticu <[email protected]>
+Florin Maticu <[email protected]> <[email protected]>
+Florin Maticu <[email protected]> <[email protected]>
+Frédéric Pierson <[email protected]>
+Fábio Souza <[email protected]>
 George Waters <[email protected]>
 George Waters <[email protected]> <[email protected]>
+Glenn Moloney <[email protected]>
 Ha Thach <[email protected]>
 Henrik Sölver <[email protected]>
+Ihor Nehrutsa <[email protected]>
+Ihor Nehrutsa <[email protected]> <[email protected]>
 Ilya Dmitrichenko <[email protected]>
 Ilya Dmitrichenko <[email protected]> <[email protected]>
+James Bowman <[email protected]>
+James Bowman <[email protected]> <James Bowman>
+James Carr <[email protected]>
+James Carr <[email protected]> <[email protected]>
+James Nadeau <[email protected]>
+Jan Hrudka <[email protected]>
 Jason Pecor <[email protected]>
 Jeff Epler <[email protected]>
 Jeff Epler <[email protected]> <[email protected]>
 Jeff Epler <[email protected]> <[email protected]>
 Jeff Epler <[email protected]> <[email protected]>
+Jensen Kuras <[email protected]>
+Jeremy Littler <[email protected]>
+Jeremy Littler <[email protected]> <[email protected]>
 Jerry Needell <[email protected]>
 Joe Bakalor <[email protected]>
+Jonah Yolles-Murphy <[email protected]>
+Jonah Yolles-Murphy <[email protected]> <[email protected]>
+Jonah Yolles-Murphy <[email protected]> <[email protected]>
+Jonah Yolles-Murphy <[email protected]> <[email protected]>
+Jonathan Giles <[email protected]>
+Jonathan Giles <[email protected]> <[email protected]>
+Jonny Bergdahl <[email protected]>
+Jonny Bergdahl <[email protected]> <[email protected]>
+Jos Verlinde <[email protected]>
+Jos Verlinde <[email protected]> <[email protected]>
+Jos Verlinde <[email protected]> <[email protected]>
 Josh Klar <[email protected]>
 Josh Klar <[email protected]> <[email protected]>
 Juan Biondi <[email protected]>
 Juan Biondi <[email protected]> <[email protected]>
+Julia Hathaway <[email protected]>
 KalbeAbbas <[email protected]>
 KalbeAbbas <[email protected]> <kalbeabbas@[email protected]>
 Kamil Tomaszewski <[email protected]>
 Kamil Tomaszewski <[email protected]> <[email protected]>
-Kattni <[email protected]> <[email protected]>
-Kattni Rembor <[email protected]>
+Kattni Rembor <[email protected]>
+Kattni Rembor <[email protected]> <[email protected]>
+Kattni Rembor <[email protected]> <[email protected]>
 Kenny <[email protected]>
 Kenny <[email protected]> <[email protected]>
+Kevin Matocha <[email protected]>
+Kevin Matocha <[email protected]> <[email protected]>
 Kevin Townsend <[email protected]>
 Kevin Townsend <[email protected]> <[email protected]>
 Krzysztof Blazewicz <[email protected]>
 Krzysztof Blazewicz <[email protected]> <[email protected]>
+Lee Atkinson <[email protected]>
 Li Weiwei <[email protected]>
 Li Weiwei <[email protected]> <[email protected]>
 Limor "Ladyada" Fried <[email protected]>
 Limor "Ladyada" Fried <[email protected]> <ladyada>
 Lucian Copeland <[email protected]>
 Lucian Copeland <[email protected]> <[email protected]>
+Mariusz Ćwikła <[email protected]>
+Mariusz Ćwikła <[email protected]> <[email protected]>
 Mark Olsson <[email protected]>
 Mark Olsson <[email protected]> <[email protected]>
+Mark Roberts <[email protected]>
+Martin Fischer <[email protected]>
 Matt Land <[email protected]>
 Matt Land <[email protected]> <[email protected]>
 Matt Wozniski <[email protected]>
@@ -67,17 +133,44 @@ Melissa LeBlanc-Williams <[email protected]>
 Melissa LeBlanc-Williams <[email protected]> <[email protected]>
 Metallicow <[email protected]>
 Metallicow <[email protected]> <[email protected]>
+Michael McWethy <[email protected]>
+Michael Weiss <[email protected]>
+MicroDev <[email protected]>
+MicroDev <[email protected]> <[email protected]>
+Mike Teachman <[email protected]>
+Milind Movasha <[email protected]>
+Miroslav Zuzelka <[email protected]>
+Noel Gaetan <[email protected]>
+Pablo Martinez Bernal <[email protected]>
+Pablo Martinez Bernal <[email protected]> <[email protected]>
+Paint Your Dragon <[email protected]>
+Patrick <[email protected]>
 Peter Hinch <[email protected]>
 Peter Hinch <[email protected]> <[email protected]>
+Pierre Constantineau <[email protected]>
+Pierre Constantineau <[email protected]> <[email protected]>
 Radomir Dopieralski <[email protected]>
 Radomir Dopieralski <[email protected]> <[email protected]>
 Rafa Gould <[email protected]>
 Rafa Gould <[email protected]> <[email protected]>
+Rami Ali <[email protected]>
+Rami Ali <[email protected]> Rami Ali <[email protected]>
+Reinhard Feger <[email protected]>
+Reinhard Feger <[email protected]> <[email protected]>
+Rick Sorensen <[email protected]>
+Rick Sorensen <[email protected]> <rick@ricklinux2>
+Robert HH <[email protected]>
+Rose Hooper <[email protected]>
 Ryan Shaw <[email protected]>
 Ryan Shaw <[email protected]> <[email protected]>
+Ryan T. Hamilton <[email protected]>
+Ryan T. Hamilton <[email protected]> <[email protected]>
+Rylie Pavlik <[email protected]>
+Rylie Pavlik <[email protected]> <[email protected]>
 Sabas <[email protected]>
 Sabas <[email protected]> <[email protected]>
 Sabas <[email protected]> <[email protected]>
+Scott Gauche <[email protected]> <[email protected]>
 Scott Shawcroft <[email protected]>
 Scott Shawcroft <[email protected]> <[email protected]>
 Scott Shawcroft <[email protected]> <[email protected]>
@@ -87,22 +180,48 @@ Sebastian Plamauer <[email protected]>
 Sebastian Plamauer <[email protected]> <[email protected]>
 Senuros <[email protected]>
 Senuros <[email protected]> <[email protected]>
+Seth Kerr <[email protected]>
+Seth Kerr <[email protected]> <[email protected]>
+Seth Kerr <[email protected]> <[email protected]>
+Shawn Hymel <[email protected]>
+Sky Bryant <[email protected]>
+Sky Bryant <[email protected]> <[email protected]>
+Stephane Smith <[email protected]>
 Stewart Colborne <[email protected]>
 Stewart Colborne <[email protected]> <[email protected]>
-TG-Techie <TGTechie01@gmail.com>
-TG-Techie <[email protected]> <[email protected].com>
+Sébastien Rinsoz <sebastien@yoctopuce.com>
+Takeo Takahashi <takeo.takahashi.xv@renesas.com>
 Thea Flowers <[email protected]>
 Thea Flowers <[email protected]> <[email protected]>
+Thorsten von Eicken <[email protected]>
+Thorsten von Eicken <[email protected]> <[email protected]>
+Tim <[email protected]>
+Tim <[email protected]> <[email protected]>
 Tobias Badertscher <[email protected]>
 Tobias Badertscher <[email protected]> <[email protected]>
+Tobias Schmale <[email protected]>
+Trammell Hudson <[email protected]>
+Tyeth Gundry <[email protected]>
+Unexpected Maker <[email protected]>
+Vladimír Smitka <[email protected]>
+Yuuki NAGAO <[email protected]>
+adam_cummick <[email protected]>
+applecuckoo <[email protected]>
+applecuckoo <[email protected]> <[email protected]>
+arturo182 <[email protected]> <[email protected]>
 danicampora <[email protected]>
 danicampora <[email protected]> <[email protected]>
-dherrada <[email protected]>
-dherrada <[email protected]> <[email protected]>
-dherrada <[email protected]> <=>
+foamyguy <[email protected]>
 glennrub <[email protected]>
+jposada202020 <[email protected]>
+jposada202020 <[email protected]> <[email protected]>
+mintakka <[email protected]>
+mintakka <[email protected]> <[email protected]>
+noqman <[email protected]>
+noqman <[email protected]> <[email protected]>
 retoc <[email protected]>
 retoc <[email protected]> <[email protected]>
+roland van straten <[email protected]>
 siddacious <[email protected]>
 siddacious <[email protected]> <[email protected]>
 siddacious <[email protected]> <[email protected]>

conf.py

@@ -110,6 +110,7 @@
 autoapi_python_class_content = "both"
 autoapi_python_use_implicit_namespaces = True
 autoapi_root = "shared-bindings"
+autoapi_file_patterns = ["*.pyi"]
 
 # Suppress cache warnings to prevent "unpickable" [sic] warning
 # about autoapi_prepare_jinja_env() from sphinx >= 7.3.0.
@@ -180,6 +181,7 @@ def autoapi_prepare_jinja_env(jinja_env):
                     ".venv",
                     ".direnv",
                     ".devcontainer/Readme.md",
+                    "circuitpython-stubs",
                     "data",
                     "docs/autoapi",
                     "docs/README.md",

docs/library/sys.rst

@@ -15,6 +15,23 @@ Functions
    function raise as `SystemExit` exception. If an argument is given, its
    value given as an argument to `SystemExit`.
 
+.. function:: print_exception(exc, file=sys.stdout, /)
+
+   This function is being deprecated and will be removed starting in
+   CircuitPython 10.x, `traceback.print_exception()` should be used instead.
+
+   Print exception with a traceback to a file-like object *file* (or
+   `sys.stdout` by default).
+
+   .. admonition:: Difference to CPython
+      :class: attention
+
+      This is simplified version of a function which appears in the
+      `traceback` module in CPython. Unlike `traceback.print_exception()`,
+      this function takes just exception value instead of exception type,
+      exception value, and traceback object; *file* argument should be
+      positional; further arguments are not supported.
+
 Constants
 ---------
 
@@ -97,12 +114,6 @@ Constants
    If you need to check whether your program runs on CircuitPython (vs other
    Python implementation), use `sys.implementation` instead.
 
-.. data:: ps1
-          ps2
-
-   Mutable attributes holding strings, which are used for the REPL prompt.  The defaults
-   give the standard Python prompt of ``>>>`` and ``...``.
-
 .. data:: stderr
 
    Standard error ``stream``.
@@ -115,14 +126,6 @@ Constants
 
    Standard output ``stream``.
 
-.. data:: tracebacklimit
-
-   A mutable attribute holding an integer value which is the maximum number of traceback
-   entries to store in an exception.  Set to 0 to disable adding tracebacks.  Defaults
-   to 1000.
-
-   Note: this is not available on all ports.
-
 .. data:: version
 
    Python language version that this implementation conforms to, as a string.

docs/shared_bindings_matrix.py

@@ -85,6 +85,7 @@
     "sys": "CIRCUITPY_SYS",
     "terminalio": "CIRCUITPY_DISPLAYIO",
     "usb": "CIRCUITPY_PYUSB",
+    "socketpool.socketpool.AF_INET6": "CIRCUITPY_SOCKETPOOL_IPV6",
 }
 
 MODULES_NOT_IN_BINDINGS = ["binascii", "errno", "json", "re", "ulab"]

lib/littlefs/lfs2.c

@@ -1079,7 +1079,7 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
 
     // if either block address is invalid we return LFS2_ERR_CORRUPT here,
     // otherwise later writes to the pair could fail
-    if (lfs2->block_count 
+    if (lfs2->block_count
             && (pair[0] >= lfs2->block_count || pair[1] >= lfs2->block_count)) {
         return LFS2_ERR_CORRUPT;
     }

lib/littlefs/lfs2.h

@@ -267,7 +267,7 @@ struct lfs2_config {
 #ifdef LFS2_MULTIVERSION
     // On-disk version to use when writing in the form of 16-bit major version
     // + 16-bit minor version. This limiting metadata to what is supported by
-    // older minor versions. Note that some features will be lost. Defaults to 
+    // older minor versions. Note that some features will be lost. Defaults to
     // to the most recent minor version when zero.
     uint32_t disk_version;
 #endif

locale/ID.po

@@ -1185,6 +1185,7 @@ msgid "Interrupted by output function"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/espressif/common-hal/microcontroller/Processor.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
 #: ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -1292,6 +1293,10 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
+#: shared-bindings/audiocore/RawSample.c
+msgid "Length of %q must be an even multiple of channel_count * type_size"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
@@ -1566,7 +1571,6 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr "Hanya alamat IPv4 yang didukung"
 
-#: ports/espressif/common-hal/socketpool/Socket.c
 #: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Hanysa socket IPv4 yang didukung"
@@ -2241,6 +2245,10 @@ msgstr "Format tidak didukung"
 msgid "Unsupported hash algorithm"
 msgstr ""
 
+#: ports/espressif/common-hal/socketpool/Socket.c
+msgid "Unsupported socket type"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update failed"