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 <tekktrik@gmail.com>
+Alec Delaney <tekktrik@gmail.com> <89490472+tekktrik@users.noreply.github.com>
+Alec Delaney <tekktrik@gmail.com> <tekktik@gmail.com>
+Alex Sirota <alex.sirota@icloud.com>
+Alex Sirota <alex.sirota@icloud.com> <67526318+ajs256@users.noreply.github.com>
 Alexander Steffen <devel.20.webmeister@spamgourmet.com>
 Alexander Steffen <devel.20.webmeister@spamgourmet.com> <Alexander.Steffen@infineon.com>
 Alexander Steffen <devel.20.webmeister@spamgourmet.com> <webmeister@users.noreply.github.com>
+Anson He <ansonhe1997@gmail.com>
+Ayke van Laethem <aykevanlaethem@gmail.com>
 Benjamin Vernoux <bvernoux@gmail.com>
+BennyE <bennye_hh@posteo.net>
+BennyE <bennye_hh@posteo.net> <benny@Benny-Win10.localdomain>
+Bernhard Bablok <bablokb@gmx.de>
+Bernhard Boser <boser@berkeley.edu>
+Bernhard Boser <boser@berkeley.edu> <49917707+iot49@users.noreply.github.com>
+Bernhard Boser <boser@berkeley.edu> <boser@server.home>
+Bill Sideris <bill88t@feline.gr>
+Brendan <2bndy5@gmail.com>
 Brent Rubell <robots199@me.com>
 Brent Rubell <robots199@me.com> <brent@xn.home>
 Brent Rubell <robots199@me.com> <brentru@users.noreply.github.com>
 Carlos <carlos.santiago.diaz@gmail.com>
+Carter Nelson <caternuson@gmail.com>
+Chris Dailey <nitz@users.noreply.github.com>
 Chris Packham <judge.packham@gmail.com>
 Chris Packham <judge.packham@gmail.com> <chris.packham@alliedtelesis.co.nz>
+Chris Wilson <christopher.david.wilson@gmail.com>
 Damiano Mazzella <damianomazzella@gmail.com>
 Damien George <damien.p.george@gmail.com>
 Dan Halbert <halbert@adafruit.com>
@@ -20,45 +39,92 @@ Daniel Pollard <daniel@learnweaver.com>
 Daniel Pollard <daniel@learnweaver.com> <daniel.pollard@learnweaver.com>
 Daniel Tralamazza <daniel@tralamazza.com>
 Daniel Tralamazza <daniel@tralamazza.com> <tralamazza@users.noreply.github.com>
+DavePutz <dwputz@gmail.com>
 David Glaude <david.glaude@gmail.com>
 David Glaude <david.glaude@gmail.com> <dglaude@users.noreply.github.com>
+Elvis Pfützenreuter <epxx@epxx.co>
+Enrique Casado <ecasado@bhdyn.com>
+Enrique Casado <ecasado@bhdyn.com> <32364364+ecasadod@users.noreply.github.com>
+Eva Herrada <eva.herrada@adafruit.com>
+Eva Herrada <eva.herrada@adafruit.com> <33632497+dherrada@users.noreply.github.com>
+Eva Herrada <eva.herrada@adafruit.com> <33632497+evaherrada@users.noreply.github.com>
+Eva Herrada <eva.herrada@adafruit.com> <dylan.herrada@adafruit.com>
+Eva Herrada <eva.herrada@adafruit.com> <dylan.herrada@gmail.com>
+Eva Herrada <eva.herrada@adafruit.com> dherrada <=>
+Florin Maticu <florin.maticu@gmail.com>
+Florin Maticu <florin.maticu@gmail.com> <3575408+flom84@users.noreply.github.com>
+Florin Maticu <florin.maticu@gmail.com> <flomaker84@gmail.com>
+Frédéric Pierson <fpierson@garatronic.fr>
+Fábio Souza <fs.embarcados@gmail.com>
 George Waters <gwatersdev@gmail.com>
 George Waters <gwatersdev@gmail.com> <george@georgeh2os.com>
+Glenn Moloney <glenn.moloney@gmail.com>
 Ha Thach <thach@tinyusb.org>
 Henrik Sölver <henrik.solver@gmail.com>
+Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
+Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com> <IhorNehrutsa@gmail.com>
 Ilya Dmitrichenko <errordeveloper@gmail.com>
 Ilya Dmitrichenko <errordeveloper@gmail.com> <ilya@xively.com>
+James Bowman <jamesb@excamera.com>
+James Bowman <jamesb@excamera.com> <James Bowman>
+James Carr <lesamouraipourpre@gmail.com>
+James Carr <lesamouraipourpre@gmail.com> <70200140+lesamouraipourpre@users.noreply.github.com>
+James Nadeau <james.nadeau@gmail.com>
+Jan Hrudka <jahr@atlas.cz>
 Jason Pecor <14111408+jpecor@users.noreply.github.com>
 Jeff Epler <jepler@gmail.com>
 Jeff Epler <jepler@gmail.com> <jeff@adafruit.com>
 Jeff Epler <jepler@gmail.com> <jepler@de11.u>
 Jeff Epler <jepler@gmail.com> <jepler@unpythonic.net>
+Jensen Kuras <jensechu@gmail.com>
+Jeremy Littler <brainboardz@gmail.com>
+Jeremy Littler <brainboardz@gmail.com> <87398149+BrainBoardz@users.noreply.github.com>
 Jerry Needell <jerryneedell@gmail.com>
 Joe Bakalor <jmbakalor@gmail.com>
+Jonah Yolles-Murphy <TGTechie01@gmail.com>
+Jonah Yolles-Murphy <TGTechie01@gmail.com> <39284876+TG-Techie@users.noreply.github.com>
+Jonah Yolles-Murphy <TGTechie01@gmail.com> <TGTechie01@gmial.com>
+Jonah Yolles-Murphy <TGTechie01@gmail.com> <tgtechie01@gmail.com>
+Jonathan Giles <jonathangiles@fastmail.fm>
+Jonathan Giles <jonathangiles@fastmail.fm> <jgiles@Jonathans-Air.lan>
+Jonny Bergdahl <jonny@bergdahl.it>
+Jonny Bergdahl <jonny@bergdahl.it> <bergdahl@users.noreply.github.com>
+Jos Verlinde <jos_verlinde@hotmail.com>
+Jos Verlinde <jos_verlinde@hotmail.com> <jos.verlinde@microsoft.com>
+Jos Verlinde <jos_verlinde@hotmail.com> <josverl@microsoft.com>
 Josh Klar <josh@klar.sh>
 Josh Klar <josh@klar.sh> <j@iv597.com>
 Juan Biondi <juanernestobiondi@gmail.com>
 Juan Biondi <juanernestobiondi@gmail.com> <juanernestobiondi@hotmail.com>
+Julia Hathaway <julia.hathaway@nxp.com>
 KalbeAbbas <kalbeabbas142@gmail.com>
 KalbeAbbas <kalbeabbas142@gmail.com> <kalbeabbas@142@gmail.com>
 Kamil Tomaszewski <kamil.tomaszewski@sony.com>
 Kamil Tomaszewski <kamil.tomaszewski@sony.com> <46525824+kamtom480@users.noreply.github.com>
-Kattni <kattni@adafruit.com> <kattni@kittyfish.org>
-Kattni Rembor <kattni@adafruit.com>
+Kattni Rembor <kattni@kattni.com>
+Kattni Rembor <kattni@kattni.com> <kattni@adafruit.com>
+Kattni Rembor <kattni@kattni.com> <kattni@kittyfish.org>
 Kenny <WarriorOfWire@users.noreply.github.com>
 Kenny <WarriorOfWire@users.noreply.github.com> <3454741+WarriorOfWire@users.noreply.github.com>
+Kevin Matocha <kmatocha@icloud.com>
+Kevin Matocha <kmatocha@icloud.com> <Dad@iMac.attlocal.net>
 Kevin Townsend <contact@microbuilder.eu>
 Kevin Townsend <contact@microbuilder.eu> <microbuilder@users.noreply.github.com>
 Krzysztof Blazewicz <blazewicz.krzysztof@gmail.com>
 Krzysztof Blazewicz <blazewicz.krzysztof@gmail.com> <krzysztof.blazewicz@uxeon.com>
+Lee Atkinson <latkinso42@gmail.com>
 Li Weiwei <liweiwei@yeweitech.org>
 Li Weiwei <liweiwei@yeweitech.org> <liweiwei@yeweitech.com>
 Limor "Ladyada" Fried <limor@ladyada.net>
 Limor "Ladyada" Fried <limor@ladyada.net> <ladyada>
 Lucian Copeland <hierophect@gmail.com>
 Lucian Copeland <hierophect@gmail.com> <hierophect@Lucians-MacBook-Air-2.local>
+Mariusz Ćwikła <mariuszcwikla@gmail.com>
+Mariusz Ćwikła <mariuszcwikla@gmail.com> <47976407+MariuszCwikla@users.noreply.github.com>
 Mark Olsson <post@markolsson.se>
 Mark Olsson <post@markolsson.se> <mark@markolsson.se>
+Mark Roberts <mdroberts1243@gmail.com>
+Martin Fischer <fischer.carlito@gmail.com>
 Matt Land <matt-land@users.noreply.github.com>
 Matt Land <matt-land@users.noreply.github.com> <mland@sparefoot.com>
 Matt Wozniski <godlygeek+git@gmail.com>
@@ -67,17 +133,44 @@ Melissa LeBlanc-Williams <melissa@adafruit.com>
 Melissa LeBlanc-Williams <melissa@adafruit.com> <melissa@melissagirl.com>
 Metallicow <metaliobovinus@gmail.com>
 Metallicow <metaliobovinus@gmail.com> <edg62702@yahoo.com>
+Michael McWethy <mrmcwethy@yahoo.com>
+Michael Weiss <github@mishafarms.us>
+MicroDev <70126934+microdev1@users.noreply.github.com>
+MicroDev <70126934+microdev1@users.noreply.github.com> <70126934+MicroDev1@users.noreply.github.com>
+Mike Teachman <mike.teachman@gmail.com>
+Milind Movasha <milind.movasha@gmail.com>
+Miroslav Zuzelka <mzuzelka@gmail.com>
+Noel Gaetan <gaetan.noel@viacesi.fr>
+Pablo Martinez Bernal <elpekenin@elpekenin.dev>
+Pablo Martinez Bernal <elpekenin@elpekenin.dev> <58857054+elpekenin@users.noreply.github.com>
+Paint Your Dragon <paintyourdragon@dslextreme.com>
+Patrick <4002194+askpatrickw@users.noreply.github.com>
 Peter Hinch <peter@hinch.me.uk>
 Peter Hinch <peter@hinch.me.uk> <peterhinch@users.noreply.github.com>
+Pierre Constantineau <jpconstantineau@gmail.com>
+Pierre Constantineau <jpconstantineau@gmail.com> <jponstantineau@gmail.com>
 Radomir Dopieralski <openstack@sheep.art.pl>
 Radomir Dopieralski <openstack@sheep.art.pl> <deshipu@users.noreply.github.com>
 Rafa Gould <rafagoulds@gmail.com>
 Rafa Gould <rafagoulds@gmail.com> <50337143+rafa-gould@users.noreply.github.com>
+Rami Ali <raminator626@hotmail.com>
+Rami Ali <raminator626@hotmail.com> Rami Ali <flowergrass@users.noreply.github.com>
+Reinhard Feger <feg@LT-Feger.icie.jku.at>
+Reinhard Feger <feg@LT-Feger.icie.jku.at> <47209718+rf-eng@users.noreply.github.com>
+Rick Sorensen <rick.sorensen@gmail.com>
+Rick Sorensen <rick.sorensen@gmail.com> <rick@ricklinux2>
+Robert HH <robert@hammelrath.com>
+Rose Hooper <rhooper@toybox.ca>
 Ryan Shaw <ryan.shaw@wisetechglobal.com>
 Ryan Shaw <ryan.shaw@wisetechglobal.com> <ryannathans@hotmail.com>
+Ryan T. Hamilton <astrobokonon@gmail.com>
+Ryan T. Hamilton <astrobokonon@gmail.com> <astrobokonon@users.noreply.github.com>
+Rylie Pavlik <rylie@ryliepavlik.com>
+Rylie Pavlik <rylie@ryliepavlik.com> <ryan.pavlik@gmail.com>
 Sabas <s@electroniccats.com>
 Sabas <s@electroniccats.com> <s@theinventorhouse.org>
 Sabas <s@electroniccats.com> <sabasjimenez@gmail.com>
+Scott Gauche <scott.gauche@gmail.com> <sgauche@users.noreply.github.com>
 Scott Shawcroft <scott@adafruit.com>
 Scott Shawcroft <scott@adafruit.com> <devnull@unpythonic.net>
 Scott Shawcroft <scott@adafruit.com> <scott.shawcroft@gmail.com>
@@ -87,22 +180,48 @@ Sebastian Plamauer <oeplse@gmail.com>
 Sebastian Plamauer <oeplse@gmail.com> <oepse@gmail.com>
 Senuros <Senuros@users.noreply.github.com>
 Senuros <Senuros@users.noreply.github.com> <senuros@noreply.github.com>
+Seth Kerr <skerr@aggies.ncat.edu>
+Seth Kerr <skerr@aggies.ncat.edu> <41877068+skerr92@users.noreply.github.com>
+Seth Kerr <skerr@aggies.ncat.edu> <sethkerr@Seths-Mac-mini.local>
+Shawn Hymel <hymelsr@vt.edu>
+Sky Bryant <mae@wolfsky.pet>
+Sky Bryant <mae@wolfsky.pet> <maeskywolf@protonmail.com>
+Stephane Smith <stephane.smith@titansensor.com>
 Stewart Colborne <tscolborne@outlook.com>
 Stewart Colborne <tscolborne@outlook.com> <tscolborne@hotmail.com>
-TG-Techie <TGTechie01@gmail.com>
-TG-Techie <TGTechie01@gmail.com> <39284876+TG-Techie@users.noreply.github.com>
+Sébastien Rinsoz <sebastien@yoctopuce.com>
+Takeo Takahashi <takeo.takahashi.xv@renesas.com>
 Thea Flowers <me@thea.codes>
 Thea Flowers <me@thea.codes> <theaflowers@google.com>
+Thorsten von Eicken <tve@voneicken.com>
+Thorsten von Eicken <tve@voneicken.com> <tve@users.noreply.github.com>
+Tim <timchinowsky@gmail.com>
+Tim <timchinowsky@gmail.com> <tim@gogemio.com>
 Tobias Badertscher <badi@baerospace.ch>
 Tobias Badertscher <badi@baerospace.ch> <python@baerospace.ch>
+Tobias Schmale <tschmale85@googlemail.com>
+Trammell Hudson <hudson@trmm.net>
+Tyeth Gundry <tyethgundry@googlemail.com>
+Unexpected Maker <seon@unexpectedmaker.com>
+Vladimír Smitka <vladimir.smitka@lynt.cz>
+Yuuki NAGAO <wf.yn386@gmail.com>
+adam_cummick <adamc@facts-eng.com>
+applecuckoo <nufjoysb@duck.com>
+applecuckoo <nufjoysb@duck.com> <113647417+applecuckoo@users.noreply.github.com>
+arturo182 <github@solder.party> <arturo182@tlen.pl>
 danicampora <danicampora@gmail.com>
 danicampora <danicampora@gmail.com> <daniel@wipy.io>
-dherrada <dylan.herrada@gmail.com>
-dherrada <dylan.herrada@gmail.com> <33632497+dherrada@users.noreply.github.com>
-dherrada <dylan.herrada@gmail.com> <=>
+foamyguy <foamyguy@gmail.com>
 glennrub <glennbakke@gmail.com>
+jposada202020 <jquintana202020@gmail.com>
+jposada202020 <jquintana202020@gmail.com> <34255413+jposada202020@users.noreply.github.com>
+mintakka <MattC867@gmail.com>
+mintakka <MattC867@gmail.com> <mattc867@gmail.com>
+noqman <noqman@cytron.io>
+noqman <noqman@cytron.io> <140384051+noqman@users.noreply.github.com>
 retoc <retoc@users.noreply.github.com>
 retoc <retoc@users.noreply.github.com> <Retoc@noreply.github.com>
+roland van straten <roland@van-straten.org>
 siddacious <nospam187+github@gmail.com>
 siddacious <nospam187+github@gmail.com> <bsiepert@gmail.com>
 siddacious <nospam187+github@gmail.com> <bsiepert@lbl.gov>

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"