Merge remote-tracking branch 'upstream/main' into esp-microros

Author: hierophect

.devcontainer/cortex-m-toolchain.sh

@@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
 cd /workspaces
 
 wget -qO gcc-arm-none-eabi.tar.xz \
-  https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+  https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
 
 tar -xJf gcc-arm-none-eabi.tar.xz
-ln -s arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
+ln -s arm-gnu-toolchain-14.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
 rm -f gcc-arm-none-eabi.tar.xz
 
 echo -e "[cortex-m-toolchain.sh] update PATH in environment"

.github/actions/deps/external/action.yml

@@ -27,7 +27,7 @@ runs:
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         # When changing this update what Windows grabs too!
-        release: '13.2.Rel1'
+        release: '14.2.Rel1'
 
     # espressif
     - name: Get espressif toolchain

.github/actions/deps/ports/broadcom/action.yml

@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Get broadcom toolchain
       run: |
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
         sudo apt-get update
         sudo apt-get install -y mtools
       shell: bash

.github/workflows/build.yml

@@ -261,9 +261,9 @@ jobs:
         python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
     - name: Install dependencies
       run: |
-        wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
-        unzip -q -d /tmp gcc-arm.zip
-        tar -C /tmp/arm-gnu-toolchain* -cf - . | tar -C /usr/local -xf -
+        wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-mingw-w64-i686-arm-none-eabi.zip
+        unzip -q -d /tmp/arm-gnu-toolchain gcc-arm.zip
+        tar -C /tmp/arm-gnu-toolchain -cf - . | tar -C /usr/local -xf -
         # We could use a venv instead, but that requires entering the venv on each run step
         # that runs in its own shell. There are some actions that help with that, but not for msys2
         # that I can find. (dhalbert)

.github/workflows/notify-on-issue-label.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
         issues: write
     steps:
-        - uses: tekktrik/issue-labeled-ping@v1
+        - uses: tekktrik/issue-labeled-ping@v2
           with:
                 github-token: ${{ secrets.GITHUB_TOKEN }}
                 user: v923z

Makefile

@@ -156,22 +156,28 @@ 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."
@@ -236,7 +242,7 @@ pseudoxml:
 .PHONY: all-source
 all-source:
 
-TRANSLATE_CHECK_SUBMODULES=if ! [ -f extmod/ulab/README.md ]; then python tools/ci_fetch_deps.py translate; fi
+TRANSLATE_CHECK_SUBMODULES=if ! [ -f extmod/ulab/README.md ]; then $(PYTHON) tools/ci_fetch_deps.py translate; fi
 TRANSLATE_COMMAND=find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -x locale/synthetic.pot -f- -L C -s --add-location=file --keyword=MP_ERROR_TEXT -o - | sed -e '/"POT-Creation-Date: /d'
 locale/circuitpython.pot: all-source
 	$(TRANSLATE_CHECK_SUBMODULES)

conf.py

@@ -434,11 +434,11 @@ def generate_redirects(app):
         return
 
     if not isinstance(app.builder, builders.StandaloneHTMLBuilder):
-        logging.warn(
+        logging.warning(
             "The 'sphinxcontib-redirects' plugin is only supported "
             "by the 'html' builder and subclasses. Skipping..."
         )
-        logging.warn(f"Builder is {app.builder.name} ({type(app.builder)})")
+        logging.warning(f"Builder is {app.builder.name} ({type(app.builder)})")
         return
 
     with open(path) as redirects:

devices/ble_hci/common-hal/_bleio/__init__.c

@@ -40,13 +40,13 @@ bool vm_used_ble;
 void common_hal_bleio_init(void) {
 }
 
-void bleio_user_reset() {
+void bleio_user_reset(void) {
     // HCI doesn't support the BLE workflow so just do a full reset.
     bleio_reset();
 }
 
 // Turn off BLE on a reset or reload.
-void bleio_reset() {
+void bleio_reset(void) {
     // Create a UUID object for all CCCD's.
     cccd_uuid.base.type = &bleio_uuid_type;
     common_hal_bleio_uuid_construct(&cccd_uuid, BLE_UUID_CCCD, NULL);

docs/prepare_readme_for_latex.py

@@ -0,0 +1,18 @@
+import shutil
+
+with open("README.rst", "r") as f:
+    readme_content = f.read()
+
+shutil.copyfile("README.rst", "README.rst.bak")
+
+# turn badge into text only
+modified_readme_content = readme_content.replace("|Weblate|", "Weblate", 1)
+
+# remove image link
+badge_link_lines = """.. |Weblate| image:: https://hosted.weblate.org/widgets/circuitpython/-/svg-badge.svg
+   :target: https://hosted.weblate.org/engage/circuitpython/?utm_source=widget"""
+
+modified_readme_content = modified_readme_content.replace(badge_link_lines, "")
+
+with open("README.rst", "w") as f:
+    f.write(modified_readme_content)