Merge pull request #9469 from dhalbert/merge-from-micropython-v1.22.2

Merge from micropython v1.22.2

Author: dhalbert

.codespell/exclude-file.txt

@@ -5,3 +5,6 @@ USB_PRODUCT = "BLOK"
 print(binascii.b2a_base64(b"fo"))
         # again, neither will "there" or "wither", since they have "the"
 i1Qb$TE"rl
+ZEN = "the zen of python beautiful is better than ugly explicit is better than implicit simple is better than complex complex is better than complicated flat is better than nested sparse is better than dense readability counts special cases arent special enough to break the rules although practicality beats purity errors should never pass silently unless explicitly silenced in the face of ambiguity refuse the temptation to guess there should be one and preferably only one obvious way to do it although that way may not be obvious at first unless youre dutch now is better than never although never is often better than right now if the implementation is hard to explain its a bad idea if the implementation is easy to explain it may be a good idea namespaces are one honking great idea  lets do more of those"
+    "arent",
+    "youre",

.git-blame-ignore-revs

@@ -1,3 +1,6 @@
+# all: Update Python formatting to ruff-format.
+bbd8760bd9a2302e5abee29db279102bb11d7732
+
 # all: Fix various spelling mistakes found by codespell 2.2.6.
 cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
 

.gitattributes

@@ -10,12 +10,15 @@
 *.props text eol=crlf
 *.bat text eol=crlf
 
+# CIRCUITPY-CHANGE: add some more binary types.
 # These are binary so should never be modified by git.
 *.a binary
+*.ico binary
 *.png binary
 *.jpg binary
 *.dxf binary
 *.mpy binary
+*.der binary
 *.deb binary
 *.zip binary
 *.pdf binary
@@ -24,11 +27,4 @@
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
-ports/stm32/pybcdc.inf_template -text
-ports/stm32/usbhost/** -text
-ports/cc3200/hal/aes.c -text
-ports/cc3200/hal/aes.h -text
-ports/cc3200/hal/des.c -text
-ports/cc3200/hal/i2s.c -text
-ports/cc3200/hal/i2s.h -text
-ports/cc3200/version.h -text
+# CIRCUITPY-CHANGE: remove non-CircuitPython tests

.github/workflows/run-tests.yml

@@ -9,14 +9,14 @@ on:
 
 jobs:
   run:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         test: [all, mpy, native, native_mpy]
     env:
       CP_VERSION: ${{ inputs.cp-version }}
-      MICROPY_CPYTHON3: python3.8
+      MICROPY_CPYTHON3: python3.12
       MICROPY_MICROPYTHON: ../ports/unix/build-coverage/micropython
       TEST_all:
       TEST_mpy: --via-mpy -d basics float micropython
@@ -32,7 +32,7 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.12
     - name: Set up submodules
       uses: ./.github/actions/deps/submodules
       with:

.gitignore

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
+# CIRCUITPY-CHANGES: many additions
+
 # Compiled Sources
 ###################
 *.o

.pre-commit-config.yaml

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: Unlicense
 
+# CIRCUITPY-CHANGE: CircuitPython-specific.
+
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1

LICENSE

@@ -17,5 +17,15 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+#CIRCUITPY-CHANGE:
+
+Unless specified otherwise (see below), the above license and copyright applies
+to all files derived from MicroPython in this repository.
+
+Individual files may include additional copyright holders and specify other licenses.
+See the comments and SPDX headers.

Makefile

@@ -282,6 +282,7 @@ check-stubs: stubs
 	@(cd $(STUBDIR) && set -- */__init__.pyi && mypy "$${@%/*}")
 	@tools/test-stubs.sh
 
+.PHONY: update-frozen-libraries
 update-frozen-libraries:
 	@echo "Updating all frozen libraries to latest tagged version."
 	cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done
@@ -350,3 +351,16 @@ remove-all-submodules:
 .PHONY: fetch-tags
 fetch-tags:
 	git fetch --tags --recurse-submodules=no --shallow-since="2023-02-01" https://github.com/adafruit/circuitpython HEAD
+
+.PHONY: coverage
+coverage:
+	make -j -C ports/unix VARIANT=coverage
+
+.PHONY: coverage-clean
+coverage-fresh:
+	make -C ports/unix VARIANT=coverage clean
+	make -j -C ports/unix VARIANT=coverage
+
+.PHONY: run-tests
+run-tests:
+	cd tests; MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py

docs/library/sys.rst

@@ -66,7 +66,7 @@ Constants
 .. data:: maxsize
 
    Maximum value which a native integer type can hold on the current platform,
-   or maximum value representable by CircuitPython integer type, if it's smaller
+   or maximum value representable by the CircuitPython integer type, if it's smaller
    than platform max value (that is the case for CircuitPython ports without
    long int support).
 

docs/readthedocs/settings/local_settings.py

@@ -1,9 +1,10 @@
 import os
 
 # Directory that the project lives in, aka ../..
-SITE_ROOT = '/'.join(os.path.dirname(__file__).split('/')[0:-2])
+SITE_ROOT = "/".join(os.path.dirname(__file__).split("/")[0:-2])
 
 TEMPLATE_DIRS = (
-    "%s/templates/" % SITE_ROOT, # Your custom template directory, before the RTD one to override it.
-    "%s/readthedocs/templates/" % SITE_ROOT, # Default RTD template dir
+    "%s/templates/"
+    % SITE_ROOT,  # Your custom template directory, before the RTD one to override it.
+    "%s/readthedocs/templates/" % SITE_ROOT,  # Default RTD template dir
 )