Merge branch 'adafruit:main' into main

Author: kylefmohr

docs/design_guide.rst

@@ -309,7 +309,7 @@ following structure:
 
 param_type
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The type of the parameter. This could be among other `int`, `float`, `str` `bool`, etc.
+The type of the parameter. This could be, among others, ``int``, ``float``, ``str``, ``bool``, etc.
 To document an object in the CircuitPython domain, you need to include a ``~`` before the
 definition as shown in the following example:
 

docs/library/builtins.rst

@@ -1,8 +1,11 @@
 :mod:`builtins` -- builtin functions and exceptions
 ===================================================
 
+..  module:: builtins
+    :synopsis: builtin Python functions
+
 All builtin functions and exceptions are described here. They are also
-available via ``builtins`` module.
+available via the ``builtins`` module.
 
 For more information about built-ins, see the following CPython documentation:
 

docs/library/collections.rst

@@ -28,7 +28,7 @@ Classes
 
         - The optional *flags* can be 1 to check for overflow when adding items.
 
-    As well as supporting `bool` and `len`, deque objects have the following
+    As well as supporting ``bool`` and ``len``, deque objects have the following
     methods:
 
     .. method:: deque.append(x)

docs/library/micropython.rst

@@ -76,7 +76,7 @@ Functions
 .. function:: heap_locked()
 
    Lock or unlock the heap.  When locked no memory allocation can occur and a
-   `MemoryError` will be raised if any heap allocation is attempted.
+   ``MemoryError`` will be raised if any heap allocation is attempted.
    `heap_locked()` returns a true value if the heap is currently locked.
 
    These functions can be nested, ie `heap_lock()` can be called multiple times

docs/shared_bindings_matrix.py

@@ -56,13 +56,23 @@
 }
 
 ADDITIONAL_MODULES = {
-    "fontio": "CIRCUITPY_DISPLAYIO",
-    "terminalio": "CIRCUITPY_DISPLAYIO",
+    "_asyncio": "MICROPY_PY_UASYNCIO",
     "adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
     "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",
+    "array": "CIRCUITPY_ARRAY",
+    # always available, so depend on something that's always 1.
+    "builtins": "CIRCUITPY",
+    "collections": "CIRCUITPY_COLLECTIONS",
+    "fontio": "CIRCUITPY_DISPLAYIO",
+    "io": "CIRCUITPY_IO",
+    "select": "MICROPY_PY_USELECT_SELECT",
+    "terminalio": "CIRCUITPY_DISPLAYIO",
+    "sys": "CIRCUITPY_SYS",
     "usb": "CIRCUITPY_USB_HOST",
 }
 
+MODULES_NOT_IN_SHARED_BINDINGS = ["_asyncio", "array", "binascii", "builtins", "collections", "errno", "json", "re", "select", "sys", "ulab"]
+
 FROZEN_EXCLUDES = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"]
 """Files and dirs at the root of a frozen directory that should be ignored.
 This is the same list as in the preprocess_frozen_modules script."""
@@ -82,7 +92,7 @@ def get_shared_bindings():
     """ Get a list of modules in shared-bindings based on folder names.
     """
     shared_bindings_dir = get_circuitpython_root_dir() / "shared-bindings"
-    return [item.name for item in shared_bindings_dir.iterdir()] + ["binascii", "errno", "json", "re", "ulab"]
+    return [item.name for item in shared_bindings_dir.iterdir()] + MODULES_NOT_IN_SHARED_BINDINGS
 
 
 def get_board_mapping():