Merge remote-tracking branch 'adafruit/main' into merge-micropython-v1.25.0

dhalbert · dhalbert · commit 1263d11286f8 · 2025-06-20T17:25:01.000-04:00
diff --git a/.codespell/ignore-words.txt b/.codespell/ignore-words.txt
@@ -26,3 +26,4 @@ ftbfs
 straightaway
 ftbs
 ftb
+curren
diff --git a/Makefile b/Makefile
@@ -156,28 +156,22 @@ epub:
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
 latex:
-	$(PYTHON) docs/prepare_readme_for_latex.py
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	mv README.rst.bak README.rst
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
 
 # seems to be malfunctioning
 latexpdf:
-	$(PYTHON) docs/prepare_readme_for_latex.py
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	mv README.rst.bak README.rst
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
 # seems to be malfunctioning
 latexpdfja:
-	$(PYTHON) docs/prepare_readme_for_latex.py
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	mv README.rst.bak README.rst
 	@echo "Running LaTeX files through platex and dvipdfmx..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
@@ -277,20 +271,20 @@ check-translate:
 
 .PHONY: stubs
 stubs:
-	@rm -rf circuitpython-stubs
-	@mkdir circuitpython-stubs
-	@$(PYTHON) tools/extract_pyi.py shared-bindings/ $(STUBDIR)
-	@$(PYTHON) tools/extract_pyi.py extmod/ulab/code/ $(STUBDIR)/ulab
-	@for d in ports/*/bindings; do \
+	rm -rf circuitpython-stubs
+	mkdir circuitpython-stubs
+	$(PYTHON) tools/extract_pyi.py shared-bindings/ $(STUBDIR)
+	$(PYTHON) tools/extract_pyi.py extmod/ulab/code/ $(STUBDIR)/ulab
+	for d in ports/*/bindings; do \
 	    $(PYTHON) tools/extract_pyi.py "$$d" $(STUBDIR); done
-	@sed -e "s,__version__,`python -msetuptools_scm`," < setup.py-stubs > circuitpython-stubs/setup.py
-	@cp README.rst-stubs circuitpython-stubs/README.rst
-	@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
-	@$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py
-	@cp -r tools/board_stubs/circuitpython_setboard circuitpython-stubs/circuitpython_setboard
-	@$(PYTHON) -m build circuitpython-stubs
-	@touch circuitpython-stubs/board/__init__.py
-	@touch circuitpython-stubs/board_definitions/__init__.py
+	sed -e "s,__version__,`python -msetuptools_scm`," < setup.py-stubs > circuitpython-stubs/setup.py
+	cp README.rst-stubs circuitpython-stubs/README.rst
+	cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
+	$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py
+	cp -r tools/board_stubs/circuitpython_setboard circuitpython-stubs/circuitpython_setboard
+	$(PYTHON) -m build circuitpython-stubs
+	touch circuitpython-stubs/board/__init__.py
+	touch circuitpython-stubs/board_definitions/__init__.py
 
 .PHONY: check-stubs
 check-stubs: stubs
diff --git a/docs/prepare_readme_for_latex.py b/docs/prepare_readme_for_latex.py
diff --git a/locale/ID.po b/locale/ID.po
@@ -6,15 +6,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2024-11-12 08:09+0000\n"
-"Last-Translator: Iqbal Rifai <iqbalrifai@163.com>\n"
+"PO-Revision-Date: 2025-06-18 17:01+0000\n"
+"Last-Translator: Dan Halbert <halbert@halwitz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ID\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.2\n"
+"X-Generator: Weblate 5.12.1\n"
 
 #: main.c
 msgid ""
@@ -76,7 +76,7 @@ msgstr " tidak ketemu.\n"
 
 #: main.c
 msgid " output:\n"
-msgstr "output:\n"
+msgstr " output:\n"
 
 #: py/objstr.c
 #, c-format
@@ -2362,7 +2362,7 @@ msgstr "Kesalahan firmware sistem tidak diketahui: %d"
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
-msgstr "Jumlah item pada RHS  tidak cocok (diharapkan %d, didapatkan %d)."
+msgstr "Jumlah item pada RHS tidak cocok (diharapkan %d, didapatkan %d)."
 
 #: ports/nordic/common-hal/_bleio/__init__.c
 msgid ""
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -158,10 +158,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/runtime.c
-msgid "%q moved from %q to %q"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -250,7 +246,7 @@ msgstr ""
 msgid "%q out of range"
 msgstr ""
 
-#: py/objmodule.c py/runtime.c
+#: py/objmodule.c
 msgid "%q renamed %q"
 msgstr ""
 
@@ -2698,6 +2694,10 @@ msgstr ""
 msgid "can only have one parent"
 msgstr ""
 
+#: py/emitinlinerv32.c
+msgid "can only have up to 4 parameters for RV32 assembly"
+msgstr ""
+
 #: py/emitinlinethumb.c
 msgid "can only have up to 4 parameters to Thumb assembly"
 msgstr ""
@@ -3867,6 +3867,30 @@ msgstr ""
 msgid "opcode"
 msgstr ""
 
+#: py/emitinlinerv32.c
+msgid "opcode '%q' argument %d: expecting %q"
+msgstr ""
+
+#: py/emitinlinerv32.c
+msgid "opcode '%q' argument %d: must not be zero"
+msgstr ""
+
+#: py/emitinlinerv32.c
+msgid "opcode '%q' argument %d: out of range"
+msgstr ""
+
+#: py/emitinlinerv32.c
+msgid "opcode '%q' argument %d: undefined label '%q'"
+msgstr ""
+
+#: py/emitinlinerv32.c
+msgid "opcode '%q' argument %d: unknown register"
+msgstr ""
+
+#: py/emitinlinerv32.c
+msgid "opcode '%q': expecting %d arguments"
+msgstr ""
+
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/bitwise.c
 #: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
 msgid "operands could not be broadcast together"
@@ -3958,6 +3982,10 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
+#: py/emitinlinerv32.c
+msgid "parameters must be registers in sequence a0 to a3"
+msgstr ""
+
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -4147,10 +4175,6 @@ msgstr ""
 msgid "splitting with sub-captures"
 msgstr ""
 
-#: py/objstr.c
-msgid "start/end indices"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4313,6 +4337,10 @@ msgstr ""
 msgid "unindent doesn't match any outer indent level"
 msgstr ""
 
+#: py/emitinlinerv32.c
+msgid "unknown RV32 instruction '%q'"
+msgstr ""
+
 #: py/objstr.c
 #, c-format
 msgid "unknown conversion specifier %c"
diff --git a/locale/it_IT.po b/locale/it_IT.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-12-06 22:06+0000\n"
-"Last-Translator: deepserket <deepserket@gmail.com>\n"
+"PO-Revision-Date: 2025-06-18 17:01+0000\n"
+"Last-Translator: Dan Halbert <halbert@halwitz.org>\n"
 "Language-Team: \n"
 "Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.12.1\n"
 
 #: main.c
 msgid ""
@@ -990,7 +990,7 @@ msgstr ""
 #: ports/nordic/sd_mutex.c
 #, c-format
 msgid "Failed to acquire mutex, err 0x%04x"
-msgstr "Impossibile acquisire il mutex, err  0x%04x"
+msgstr "Impossibile acquisire il mutex, err 0x%04x"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Failed to add service TXT record"
@@ -1057,7 +1057,7 @@ msgstr ""
 #: ports/nordic/sd_mutex.c
 #, c-format
 msgid "Failed to release mutex, err 0x%04x"
-msgstr "Impossibile rilasciare il mutex, err  0x%04x"
+msgstr "Impossibile rilasciare il mutex, err 0x%04x"
 
 #: ports/zephyr-cp/common-hal/wifi/Radio.c
 msgid "Failed to set hostname"
@@ -1829,9 +1829,10 @@ msgid "Pipe error"
 msgstr ""
 
 #: py/builtinhelp.c
-#, fuzzy
 msgid "Plus any modules on the filesystem\n"
-msgstr "Imposssibile rimontare il filesystem"
+msgstr ""
+"Imposssibile rimontare il filesystem\\n"
+"\n"
 
 #: shared-module/vectorio/Polygon.c
 msgid "Polygon needs at least 3 points"
diff --git a/locale/tr.po b/locale/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-07-03 19:09+0000\n"
-"Last-Translator: Hacı <qwehacim3542qwe@gmail.com>\n"
+"PO-Revision-Date: 2025-06-18 17:01+0000\n"
+"Last-Translator: Dan Halbert <halbert@halwitz.org>\n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7-dev\n"
+"X-Generator: Weblate 5.12.1\n"
 
 #: main.c
 msgid ""
@@ -750,7 +750,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on RTC IO from deep sleep."
-msgstr ""
+msgstr "Sadece alarm RTC IO'yu uyandırabilir."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on one low pin while others alarm high from deep sleep."
diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -178,11 +178,24 @@ MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_get_height_obj, picodvi_framebuffe
 MP_PROPERTY_GETTER(picodvi_framebuffer_height_obj,
     (mp_obj_t)&picodvi_framebuffer_get_height_obj);
 
+//|     color_depth: int
+//|     """The color depth of the framebuffer."""
+static mp_obj_t picodvi_framebuffer_get_color_depth(mp_obj_t self_in) {
+    picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_picodvi_framebuffer_get_color_depth(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_get_color_depth_obj, picodvi_framebuffer_get_color_depth);
+MP_PROPERTY_GETTER(picodvi_framebuffer_color_depth_obj,
+    (mp_obj_t)&picodvi_framebuffer_get_color_depth_obj);
+
+
 static const mp_rom_map_elem_t picodvi_framebuffer_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&picodvi_framebuffer_deinit_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&picodvi_framebuffer_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&picodvi_framebuffer_height_obj) },
+    { MP_ROM_QSTR(MP_QSTR_color_depth), MP_ROM_PTR(&picodvi_framebuffer_color_depth_obj) },
 };
 static MP_DEFINE_CONST_DICT(picodvi_framebuffer_locals_dict, picodvi_framebuffer_locals_dict_table);
 
diff --git a/ports/silabs/common-hal/digitalio/DigitalInOut.h b/ports/silabs/common-hal/digitalio/DigitalInOut.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adafruit for EFR32 project
-
+ */
 #ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
 #define MICROPY_INCLUDED_EFR32_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
 
diff --git a/py/runtime.c b/py/runtime.c
@@ -50,7 +50,7 @@
 
 #if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
 #include "extmod/vfs.h"
-#endif 
+#endif
 
 // CIRCUITPY-CHANGE
 #if CIRCUITPY_WARNINGS
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,9 +8,6 @@
 # Ruff settings copied from MicroPython
 
 [tool.ruff]
-# Exclude third-party code from linting and formatting
-extend-exclude = ["lib"]
-line-length = 99
 target-version = "py37"
 
 line-length = 99
diff --git a/tests/extmod/deflate_compress_memory_error.py b/tests/extmod/deflate_compress_memory_error.py
@@ -28,7 +28,7 @@
 
 # Try to compress.  This will try to allocate a large window and fail.
 try:
-    g.write('test')
+    g.write("test")
 except MemoryError:
     print("MemoryError")
 
diff --git a/tests/run-tests.py b/tests/run-tests.py
@@ -341,7 +341,7 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
         # CIRCUITPY-CHANGE: removal and additions
         # REMOVE "esp32/partition_ota.py",
         "circuitpython/traceback_test.py",
-        "circuitpython/traceback_test_chained.py", add
+        "circuitpython/traceback_test_chained.py",
     )
 ]
 
@@ -954,7 +954,7 @@ def run_one_test(test_file):
             # Expected output is result of running unittest.
             output_expected = None
         else:
-           test_file_expected = test_file + ".exp"
+            test_file_expected = test_file + ".exp"
             if os.path.isfile(test_file_expected):
                 # Expected output given by a file, so read that in.
                 with open(test_file_expected, "rb") as f:
@@ -1325,14 +1325,15 @@ def main():
     if not args.keep_path:
         # Clear search path to make sure tests use only builtin modules, those in
         # extmod, and a path to unittest in case it's needed.
-        # CIRCUITPY-CHANGE: Add testlib for skip_if and our async stuff.        os.environ["MICROPYPATH"] = (
+        # CIRCUITPY-CHANGE: Add testlib for skip_if and our async stuff.
+        os.environ["MICROPYPATH"] = (
             ".frozen"
             + os.pathsep
-            + base_path("testlib"),
+            + base_path("testlib")
             + os.pathsep
-            + base_path("../frozen/Adafruit_CircuitPython_asyncio"),
+            + base_path("../frozen/Adafruit_CircuitPython_asyncio")
             + os.pathsep
-            + base_path("../frozen/Adafruit_CircuitPython_Ticks"),
+            + base_path("../frozen/Adafruit_CircuitPython_Ticks")
             + os.pathsep
             + base_path("../extmod")
             + os.pathsep

-Original file line number
+Diff line change
 straightaway
 ftbs
 ftb
 +curren