From ff65863719e9f7e3f722452974e10f90044f2f8d Mon Sep 17 00:00:00 2001 From: Kamil Tomaszewski Date: Tue, 27 Jul 2021 11:25:51 +0200 Subject: [PATCH 1/3] spresense: update SDK to 2.2.0 --- ports/cxd56/spresense-exported-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cxd56/spresense-exported-sdk b/ports/cxd56/spresense-exported-sdk index 2ec2a15383..b575f1c48a 160000 --- a/ports/cxd56/spresense-exported-sdk +++ b/ports/cxd56/spresense-exported-sdk @@ -1 +1 @@ -Subproject commit 2ec2a1538362696118dc3fdf56f33dacaf8f4067 +Subproject commit b575f1c48afb5acca27a1281a9036287cf3d2868 From 0eab2eb162808193602148d993e7bb4cd8de8e27 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 27 Jul 2021 08:45:30 -0400 Subject: [PATCH 2/3] Use sphinx-autoapi 1.8.1 until it's fixed --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 6db56d8940..1fb88552fe 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,7 +16,7 @@ cpp-coveralls Sphinx<4 sphinx-rtd-theme myst-parser -sphinx-autoapi +sphinx-autoapi<=1.8.1 sphinxcontrib-svg2pdfconverter readthedocs-sphinx-search From a974a2d3c1b1f8ea2ee848c375c9b8d9a535c8b3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 27 Jul 2021 08:57:13 -0400 Subject: [PATCH 3/3] allow micropython as top-level dir name in duplicate pid/vid check --- tools/ci_check_duplicate_usb_vid_pid.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py index 72f7858898..3994e9fe36 100644 --- a/tools/ci_check_duplicate_usb_vid_pid.py +++ b/tools/ci_check_duplicate_usb_vid_pid.py @@ -70,10 +70,12 @@ def configboard_files(): """A pathlib glob search for all ports/*/boards/*/mpconfigboard.mk file paths. - :returns: A ``pathlib.Path.glob()`` genarator object + :returns: A ``pathlib.Path.glob()`` generator object """ working_dir = pathlib.Path().resolve() - if not working_dir.name.startswith("circuitpython"): + if not working_dir.name.startswith("circuitpython") and not working_dir.name.startswith( + "micropython" + ): raise RuntimeError( "Please run USB VID/PID duplicate verification at the " "top-level directory." )