Merge branch 'adafruit:main' into issue-10016

Author: eightycc

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."

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)

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pin_names.h

@@ -6,8 +6,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
-
+// OK to include more than once because FORMAT_PIN may be different.
 
 // define FORMAT_PIN(pin_name) and then include this file.
 

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pin_names.h

@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
+// OK to include more than once because FORMAT_PIN may be different.
 
 
 // define FORMAT_PIN(pin_name) and then include this file.

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pin_names.h

@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
+// OK to include more than once because FORMAT_PIN may be different.
 
 
 // define FORMAT_PIN(pin_name) and then include this file.

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pin_names.h

@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
+// OK to include more than once because FORMAT_PIN may be different.
 
 
 // define FORMAT_PIN(pin_name) and then include this file.

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pin_names.h

@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
+// OK to include more than once because FORMAT_PIN may be different.
 
 
 // define FORMAT_PIN(pin_name) and then include this file.

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pin_names.h

@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
+// OK to include more than once because FORMAT_PIN may be different.
 
 
 // define FORMAT_PIN(pin_name) and then include this file.

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pin_names.h

@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
+// OK to include more than once because FORMAT_PIN may be different.
 
 
 // define FORMAT_PIN(pin_name) and then include this file.

ports/mimxrt10xx/peripherals/mimxrt10xx/pin_names.h

@@ -5,8 +5,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-#pragma once
-
 // OK to include more than once because FORMAT_PIN may be different.
 
 #ifdef MIMXRT1011_SERIES

tools/build_board_info.py

@@ -173,6 +173,14 @@ def create_pr(changes, updated, git_info, user):
         changes["new_release"], boards, languages
     )
 
+    # Sync main so that the fork has the same commit sha1
+    sync_main = {"branch": "main"}
+    response = github.post(
+        "/repos/{}/circuitpython-org/merge-upstream".format(user), json=sync_main
+    )
+    if not response.ok:
+        raise SystemExit(f"unable to sync main: {response.text}")
+
     create_branch = {"ref": "refs/heads/" + branch_name, "sha": commit_sha}
     response = github.post("/repos/{}/circuitpython-org/git/refs".format(user), json=create_branch)
     if not response.ok and response.json()["message"] != "Reference already exists":