From 6d89b4ae8610c3aeedb666b6cc209d2240e194cc Mon Sep 17 00:00:00 2001
From: Federico Caselli <cfederico87@gmail.com>
Date: Wed, 10 Dec 2025 21:23:08 +0100
Subject: [PATCH] update wheels and test pipelines

Change-Id: If4bf769cf6c2c7e069b4db8ae42fdd01de1a2e38
---
 .github/workflows/create-wheels.yaml |  8 ++++----
 .github/workflows/run-test.yaml      | 22 +++++++---------------
 pyproject.toml                       |  7 +------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml
index f9b64a57bb..b93e028bf9 100644
--- a/.github/workflows/create-wheels.yaml
+++ b/.github/workflows/create-wheels.yaml
@@ -28,8 +28,7 @@ jobs:
         os:
           - "windows-2022"
           - "windows-11-arm"
-          # TODO: macos-14 uses arm macs (only python 3.10+) - make arm wheel on it
-          - "macos-13"
+          - "macos-15"
           - "ubuntu-22.04"
           - "ubuntu-22.04-arm"
         linux_archs:
@@ -46,10 +45,11 @@ jobs:
         exclude:
           - os: "windows-2022"
             linux_archs: "aarch64"
+          # ignored on windows, just avoid to run it multiple times
           - os: "windows-11-arm"
             linux_archs: "aarch64"
-          - os: "macos-13"
-            linux_archs: "aarch64"
+          - os: "macos-15"
+            linux_archs: "x86_64"
           - os: "ubuntu-22.04"
             linux_archs: "aarch64"
           - os: "ubuntu-22.04-arm"
diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
index 1ec016e21b..488428a685 100644
--- a/.github/workflows/run-test.yaml
+++ b/.github/workflows/run-test.yaml
@@ -31,7 +31,6 @@ jobs:
           - "windows-latest"
           - "windows-11-arm"
           - "macos-latest"
-          - "macos-13"
         python-version:
           - "3.10"
           - "3.11"
@@ -39,7 +38,7 @@ jobs:
           - "3.13"
           - "3.14"
           - "3.14t"
-          - "pypy-3.10"
+          - "pypy-3.11"
         build-type:
           # builds greenlet, runs asyncio tests.  includes aiosqlite driver
           - "cext-greenlet"
@@ -55,7 +54,7 @@ jobs:
 
         include:
           # autocommit tests fail on the ci for some reason
-          - python-version: "pypy-3.10"
+          - python-version: "pypy-3.11"
             pytest-args: "-k 'not test_autocommit_on and not test_turn_autocommit_off_via_default_iso_level and not test_autocommit_isolation_level'"
 
         exclude:
@@ -66,8 +65,6 @@ jobs:
             os: "windows-11-arm"
           - build-type: "cext-greenlet"
             os: "macos-latest"
-          - build-type: "cext-greenlet"
-            os: "macos-13"
 
           # the threaded pythons are not stable under greenlet. Even
           # though we can run individual tests, when you run the whole suite
@@ -97,22 +94,17 @@ jobs:
             architecture: x86
           - os: "macos-latest"
             architecture: x64
-          # macos 13: uses intel macs. no arm64, x86
-          - os: "macos-13"
-            architecture: arm64
-          - os: "macos-13"
-            architecture: x86
           # pypy does not have cext or x86 or arm on linux
-          - python-version: "pypy-3.10"
+          - python-version: "pypy-3.11"
             build-type: "cext"
           - os: "ubuntu-22.04-arm"
-            python-version: "pypy-3.10"
+            python-version: "pypy-3.11"
           - os: "windows-latest"
-            python-version: "pypy-3.10"
+            python-version: "pypy-3.11"
             architecture: x86
           # Setup-python does not support any versions before 3.11 for arm64 windows
           - os: "windows-11-arm"
-            python-version: "pypy-3.10"
+            python-version: "pypy-3.11"
           - os: "windows-11-arm"
             python-version: "3.10"
           - os: "windows-11-arm"
@@ -141,7 +133,7 @@ jobs:
 
       - name: Run tests
         run: nox -v -s github-${{ matrix.build-type }} -- ${{ matrix.pytest-args }}
-        continue-on-error: ${{ matrix.python-version == 'pypy-3.10' }}
+        continue-on-error: ${{ matrix.python-version == 'pypy-3.11' }}
 
   run-nox:
     name: ${{ matrix.nox-env }}-${{ matrix.python-version }}
diff --git a/pyproject.toml b/pyproject.toml
index c06c26fb29..25c2c13879 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -355,14 +355,9 @@ test-requires = "pytest pytest-xdist"
 test-command = "python -s -m pytest -c {project}/pyproject.toml -n4 -q --nomemory --notimingintensive --nomypy {project}/test"
 
 build = "*"
-# python 3.6, 3.7 are no longer supported by sqlalchemy
-# pypy uses the universal wheel fallback, since it does not use any compiled extension
-skip = "cp36-* cp37-* pp*"
-# TODO: remove this skip once action support arm macs
-test-skip = "*-macosx_arm64"
 
 [tool.cibuildwheel.macos]
-archs = ["x86_64", "arm64"]
+archs = ["arm64"]
 
 # On an Linux Intel runner with qemu installed, build Intel and ARM wheels
 # NOTE: this is overriden in the pipeline using the CIBW_ARCHS_LINUX env variable to speed up the build
-- 
2.47.3