Merge branch 'main' into rm-3.8

Author: hugovk

.github/workflows/apple.yml

@@ -4,16 +4,13 @@ on:
   push:
     branches: [main]
   pull_request:
-  schedule:
-    - cron: '13 11 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   pythonbuild:
-    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     runs-on: 'macos-13'
     steps:
       - uses: actions/checkout@v4
@@ -41,7 +38,6 @@ jobs:
           path: target/release/pythonbuild
 
   build:
-    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:

.github/workflows/linux.yml

@@ -4,16 +4,13 @@ on:
   push:
     branches: [main]
   pull_request:
-  schedule:
-    - cron: '13 11 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   pythonbuild:
-    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     runs-on: ubuntu-22.04
     steps:
       - name: Install System Dependencies
@@ -46,7 +43,6 @@ jobs:
           path: target/release/pythonbuild
 
   image:
-    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:
@@ -117,7 +113,6 @@ jobs:
           path: build/image-*
 
   build:
-    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:
@@ -876,7 +871,6 @@ jobs:
   # GitHub enforces a limit of 256 entries per matrix, which we exceeded above
   # 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

@@ -4,17 +4,14 @@ on:
   push:
     branches: [main]
   pull_request:
-  schedule:
-    - cron: '13 11 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   pythonbuild:
-    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
-    runs-on: 'windows-2019'
+    runs-on: 'windows-2022'
     steps:
       - uses: actions/checkout@v4
 
@@ -41,7 +38,6 @@ jobs:
           path: target/release/pythonbuild.exe
 
   build:
-    if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
     strategy:
       fail-fast: false
       matrix:
@@ -66,7 +62,7 @@ jobs:
             options: 'freethreaded+pgo'
 
     needs: pythonbuild
-    runs-on: 'windows-2019'
+    runs-on: 'windows-2022'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -96,7 +92,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-unix/build-sqlite.sh

@@ -22,7 +22,7 @@ elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
 fi
 
-CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure ${CONFIGURE_FLAGS}
+CFLAGS="${EXTRA_TARGET_CFLAGS} -DSQLITE_ENABLE_DBSTAT_VTAB -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure ${CONFIGURE_FLAGS}
 
 make -j ${NUM_CPUS}
 make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out

cpython-windows/build.py

@@ -1657,7 +1657,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.