Merge branch 'main' of https://github.com/adafruit/circuitpython into arduino-nano-esp32s3

Author: makermelissa

conf.py

@@ -30,6 +30,7 @@
 from sphinx.transforms import SphinxTransform
 from docutils import nodes
 from sphinx import addnodes
+from sphinx.ext import intersphinx
 
 tools_describe = str(pathlib.Path(__file__).parent / "tools/describe")
 
@@ -441,7 +442,8 @@ def autoapi_prepare_jinja_env(jinja_env):
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {"cpython": ('https://docs.python.org/3/', None),
-                       "register": ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None)}
+                       "register": ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None),
+                       "typing": ('https://circuitpython.readthedocs.io/projects/adafruit-circuitpython-typing/en/latest/', None)}
 
 # Adapted from sphinxcontrib-redirects
 from sphinx.builders import html as builders
@@ -483,6 +485,26 @@ def generate_redirects(app):
             with open(redirected_filename, 'w') as f:
                 f.write(TEMPLATE % urllib.parse.quote(to_path, '#/'))
 
+def adafruit_typing_workaround(app, env, node, contnode):
+    # Sphinx marks a requesting node that uses circuitpython-typing
+    # as looking for a "class" definition, but unfortunately
+    # Sphinx doesn't recognize TypeAlias based types usefully from
+    # the typing library.
+    # (see: https://github.com/sphinx-doc/sphinx/issues/8934)
+    # Instead, it categorizes these types as "data".
+    # (see: python -m sphinx.ext.intersphinx \
+    #   https://docs.circuitpython.org/projects/adafruit-circuitpython-typing/en/latest/objects.inv)
+    # This workaround traps missing references, checks if
+    # they are likely to be in the circuitpython_typing package,
+    # and changes the requesting type from "class" to "data" if
+    # needed, and re-tries the reference resolver.
+    ref = node.get("reftarget", None)
+    if ref and ref.startswith("circuitpython_typing."):
+        dtype = node.get("reftype", None)
+        if dtype != "data":
+            node.attributes.update({"reftype": "data"})
+            return intersphinx.missing_reference(app, env, node, contnode)
+
 
 class CoreModuleTransform(SphinxTransform):
     default_priority = 870
@@ -519,4 +541,5 @@ def setup(app):
     app.add_js_file("filter.js")
     app.add_config_value('redirects_file', 'redirects', 'env')
     app.connect('builder-inited', generate_redirects)
+    app.connect('missing-reference', adafruit_typing_workaround)
     app.add_transform(CoreModuleTransform)

docs/redirects.txt

@@ -1,3 +1,4 @@
+index.rst README.html
 shared-bindings//__init__.rst shared-bindings//
 shared-bindings/_bleio/Adapter.rst shared-bindings/_bleio/#_bleio.Adapter
 shared-bindings/_bleio/Address.rst shared-bindings/_bleio/#_bleio.Address

docs/shared_bindings_matrix.py

@@ -148,66 +148,36 @@ def get_board_mapping():
     return boards
 
 
-def read_mpconfig():
-    """Open 'circuitpy_mpconfig.mk' and return the contents."""
-    configs = []
-    cpy_mpcfg = get_circuitpython_root_dir() / "py" / "circuitpy_mpconfig.mk"
-    with open(cpy_mpcfg) as mpconfig:
-        configs = mpconfig.read()
-
-    return configs
-
-
 def build_module_map():
     """Establish the base of the JSON file, based on the contents from
-    `configs`. Base will contain module names, if they're part of
-    the `FULL_BUILD`, or their default value (0, 1, or a list of
-    modules that determine default [see audiocore, audiomixer, etc.]).
-
+    `configs`. Base contains the module name and the controlling C macro name.
     """
     base = dict()
     modules = get_bindings()
-    configs = read_mpconfig()
-    full_build = False
     for module in modules:
         full_name = module
         if module in ADDITIONAL_MODULES:
             search_identifier = ADDITIONAL_MODULES[module]
         else:
             search_identifier = "CIRCUITPY_" + module.lstrip("_").upper()
-        re_pattern = f"{re.escape(search_identifier)}\s*\??=\s*(.+)"
-        find_config = re.findall(re_pattern, configs)
-        if not find_config:
-            continue
-        find_config = ", ".join([x.strip("$()") for x in find_config])
-
-        full_build = int("CIRCUITPY_FULL_BUILD" in find_config)
-        if not full_build:
-            default_val = find_config
-        else:
-            default_val = "None"
 
         base[module] = {
             "name": full_name,
-            "full_build": str(full_build),
-            "default_value": default_val,
-            "excluded": {},
             "key": search_identifier,
         }
 
     return base
 
 
 def get_settings_from_makefile(port_dir, board_name):
-    """Invoke make in a mode which prints the database, then parse it for
-    settings.
+    """Invoke make to print the value of critical build settings
 
     This means that the effect of all Makefile directives is taken
     into account, without having to re-encode the logic that sets them
     in this script, something that has proved error-prone
     """
     contents = subprocess.run(
-        ["make", "-C", port_dir, f"BOARD={board_name}", "-qp", "print-CC"],
+        ["make", "-C", port_dir, "-f", "Makefile", f"BOARD={board_name}", "print-CFLAGS", "print-CIRCUITPY_BUILD_EXTENSIONS", "print-FROZEN_MPY_DIRS", "print-SRC_PATTERNS"],
         encoding="utf-8",
         errors="replace",
         stdout=subprocess.PIPE,
@@ -223,9 +193,10 @@ def get_settings_from_makefile(port_dir, board_name):
 
     settings = {}
     for line in contents.stdout.split("\n"):
-        # Handle both = and := definitions.
-        m = re.match(r"^([A-Z][A-Z0-9_]*) :?= (.*)$", line)
-        if m:
+        if line.startswith('CFLAGS ='):
+            for m in re.findall('-D([A-Z][A-Z0-9_]*)=(\d+)', line):
+                settings[m[0]] = m[1]
+        elif m := re.match(r"^([A-Z][A-Z0-9_]*) = (.*)$", line):
             settings[m.group(1)] = m.group(2)
 
     return settings
@@ -268,6 +239,10 @@ def get_repository_url(directory):
     repository_urls[directory] = path
     return path
 
+def remove_prefix(s, prefix):
+    if not s.startswith(prefix):
+        raise ValueError(f"{s=} does not start with {prefix=}")
+    return s.removeprefix(prefix)
 
 def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
     """
@@ -280,7 +255,8 @@ def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
     """
     frozen_modules = []
     for frozen_path in filter(lambda x: x, frozen_mpy_dirs.split(" ")):
-        source_dir = get_circuitpython_root_dir() / frozen_path[7:]
+        frozen_path = remove_prefix(frozen_path, '../../')
+        source_dir = get_circuitpython_root_dir() / frozen_path
         url_repository = get_repository_url(source_dir)
         for sub in source_dir.glob("*"):
             if sub.name in FROZEN_EXCLUDES:

extmod/ulab

@@ -1770,6 +1770,10 @@ msgstr ""
 msgid "Pins must share PWM slice"
 msgstr ""
 
+#: shared-module/usb/core/Device.c
+msgid "Pipe error"
+msgstr ""
+
 #: py/builtinhelp.c
 msgid "Plus any modules on the filesystem\n"
 msgstr "Tambahkan module apapun pada filesystem\n"
@@ -1849,7 +1853,8 @@ msgstr "Kesalahan pembuatan nomor acak"
 
 #: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/bitmaptools/__init__.c
+#: shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Baca-saja"
 
@@ -2077,8 +2082,8 @@ msgid "Too many channels in sample."
 msgstr "Terlalu banyak channel dalam sampel"
 
 #: shared-module/displayio/__init__.c
-msgid "Too many display busses"
-msgstr "Terlalu banyak tampilan bus"
+msgid "Too many display busses; forgot displayio.release_displays() ?"
+msgstr ""
 
 #: shared-module/displayio/__init__.c
 msgid "Too many displays"
@@ -3282,6 +3287,10 @@ msgstr ""
 msgid "input dtype must be float or complex"
 msgstr ""
 
+#: extmod/ulab/code/numpy/poly.c
+msgid "input is not iterable"
+msgstr ""
+
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "input matrix is asymmetric"
 msgstr ""
@@ -3327,10 +3336,6 @@ msgstr ""
 msgid "input vectors must be of equal length"
 msgstr ""
 
-#: extmod/ulab/code/numpy/poly.c
-msgid "inputs are not iterable"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -4050,7 +4055,7 @@ msgstr ""
 msgid "sosfilt requires iterable arguments"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "source palette too large"
 msgstr ""
 
@@ -4385,6 +4390,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "Too many display busses"
+#~ msgstr "Terlalu banyak tampilan bus"
+
 #~ msgid "Hardware busy, try alternative pins"
 #~ msgstr "Perangkat keras sibuk, coba pin alternatif"
 

locale/ID.po

@@ -1473,6 +1473,10 @@ msgstr ""
 msgid "No capture in progress"
 msgstr ""
 
+#: shared-module/usb/core/Device.c
+msgid "No configuration set"
+msgstr ""
+
 #: shared-bindings/_bleio/PacketBuffer.c
 msgid "No connection: length cannot be determined"
 msgstr ""
@@ -1536,6 +1540,10 @@ msgstr ""
 msgid "No timer available"
 msgstr ""
 
+#: shared-module/usb/core/Device.c
+msgid "No usb host port initialized"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2056,7 +2064,7 @@ msgid "Too many channels in sample."
 msgstr ""
 
 #: shared-module/displayio/__init__.c
-msgid "Too many display busses"
+msgid "Too many display busses; forgot displayio.release_displays() ?"
 msgstr ""
 
 #: shared-module/displayio/__init__.c
@@ -3259,6 +3267,10 @@ msgstr ""
 msgid "input dtype must be float or complex"
 msgstr ""
 
+#: extmod/ulab/code/numpy/poly.c
+msgid "input is not iterable"
+msgstr ""
+
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "input matrix is asymmetric"
 msgstr ""
@@ -3304,10 +3316,6 @@ msgstr ""
 msgid "input vectors must be of equal length"
 msgstr ""
 
-#: extmod/ulab/code/numpy/poly.c
-msgid "inputs are not iterable"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""

locale/circuitpython.pot

@@ -1761,6 +1761,10 @@ msgstr ""
 msgid "Pins must share PWM slice"
 msgstr ""
 
+#: shared-module/usb/core/Device.c
+msgid "Pipe error"
+msgstr ""
+
 #: py/builtinhelp.c
 msgid "Plus any modules on the filesystem\n"
 msgstr ""
@@ -1840,7 +1844,8 @@ msgstr ""
 
 #: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/bitmaptools/__init__.c
+#: shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -2066,7 +2071,7 @@ msgid "Too many channels in sample."
 msgstr ""
 
 #: shared-module/displayio/__init__.c
-msgid "Too many display busses"
+msgid "Too many display busses; forgot displayio.release_displays() ?"
 msgstr ""
 
 #: shared-module/displayio/__init__.c
@@ -3269,6 +3274,10 @@ msgstr ""
 msgid "input dtype must be float or complex"
 msgstr ""
 
+#: extmod/ulab/code/numpy/poly.c
+msgid "input is not iterable"
+msgstr ""
+
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "input matrix is asymmetric"
 msgstr ""
@@ -3314,10 +3323,6 @@ msgstr ""
 msgid "input vectors must be of equal length"
 msgstr ""
 
-#: extmod/ulab/code/numpy/poly.c
-msgid "inputs are not iterable"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -4036,7 +4041,7 @@ msgstr ""
 msgid "sosfilt requires iterable arguments"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "source palette too large"
 msgstr ""