Merge pull request adafruit#7204 from jepler/build-python3x

dhalbert · web-flow · commit 845b68c351bd · 2022-11-30T15:18:29.000-05:00
return to using python 3.x for builds
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py test ${{ github.sha }}
     - name: CircuitPython version
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py website ${{ github.sha }}
     - name: Install deps
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Install deps
       run: |
         sudo apt-get install -y gettext uncrustify
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 716d8531d71b122975e2966a24ec7613b87eb7b0
+Subproject commit 26716e006d68e5a584ac29b85d9e2979563fc827
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
@@ -233,7 +233,7 @@ def set_docs_to_build(build_all):
     doc_match = build_all
     if not build_all:
         doc_pattern = re.compile(
-            r"^(?:docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
+            r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
         )
         for p in changed_files:
             if doc_pattern.search(p):

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ def set_docs_to_build(build_all):`
`233`	`233`	`doc_match = build_all`
`234`	`234`	`if not build_all:`
`235`	`235`	`doc_pattern = re.compile(`
`236`		`- r"^(?:docs\|extmod/ulab\|(?:(?:ports/\w+/bindings\|shared-bindings)\S+\.c\|conf\.py\|tools/extract_pyi\.py\|requirements-doc\.txt)$)\|(?:-stubs\|\.(?:md\|MD\|rst\|RST))$"`
	`236`	`+ r"^(?:.github/workflows/\|docs\|extmod/ulab\|(?:(?:ports/\w+/bindings\|shared-bindings)\S+\.c\|conf\.py\|tools/extract_pyi\.py\|requirements-doc\.txt)$)\|(?:-stubs\|\.(?:md\|MD\|rst\|RST))$"`
`237`	`237`	`)`
`238`	`238`	`for p in changed_files:`
`239`	`239`	`if doc_pattern.search(p):`