Merge branch 'main' into sqlite-enable-dbstat

Author: zanieb

.github/workflows/apple.yml

@@ -13,6 +13,7 @@ concurrency:
 
 jobs:
   pythonbuild:
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     runs-on: 'macos-13'
     steps:
       - uses: actions/checkout@v4
@@ -40,6 +41,7 @@ jobs:
           path: target/release/pythonbuild
 
   build:
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:

.github/workflows/linux.yml

@@ -13,6 +13,7 @@ concurrency:
 
 jobs:
   pythonbuild:
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     runs-on: ubuntu-22.04
     steps:
       - name: Install System Dependencies
@@ -45,6 +46,7 @@ jobs:
           path: target/release/pythonbuild
 
   image:
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:
@@ -115,6 +117,7 @@ jobs:
           path: build/image-*
 
   build:
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:
@@ -871,8 +874,9 @@ jobs:
 
 
   # GitHub enforces a limit of 256 entries per matrix, which we exceeded above
-  # so the CPytho 3.13 jobs are split out
+  # so the CPython 3.13 jobs are split out
   build-313:
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:

.github/workflows/windows.yml

@@ -13,7 +13,8 @@ concurrency:
 
 jobs:
   pythonbuild:
-    runs-on: 'windows-2019'
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
+    runs-on: 'windows-2022'
     steps:
       - uses: actions/checkout@v4
 
@@ -40,6 +41,7 @@ jobs:
           path: target/release/pythonbuild.exe
 
   build:
+    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:
@@ -64,7 +66,7 @@ jobs:
             options: 'freethreaded+pgo'
 
     needs: pythonbuild
-    runs-on: 'windows-2019'
+    runs-on: 'windows-2022'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -94,7 +96,7 @@ jobs:
       - name: Build
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
           py.exe -3.9 build-windows.py --python ${{ matrix.py }} --sh c:\cygwin\bin\sh.exe --options ${{ matrix.options }}
 
       - name: Validate Distribution

cpython-windows/build.py

@@ -1887,7 +1887,7 @@ def main() -> None:
     parser.add_argument(
         "--vs",
         choices={"2019", "2022"},
-        default="2019",
+        default="2022",
         help="Visual Studio version to use",
     )
     parser.add_argument(

src/validation.rs

@@ -107,6 +107,7 @@ const PE_ALLOWED_LIBRARIES: &[&str] = &[
     "USERENV.dll",
     "VERSION.dll",
     "VCRUNTIME140.dll",
+    "VCRUNTIME140_1.dll",
     "WINMM.dll",
     "WS2_32.dll",
     // Our libraries.