From: Federico Caselli <cfederico87@gmail.com>
Date: Sat, 27 Apr 2024 08:48:47 +0000 (+0200)
Subject: Fixing ci errors
X-Git-Tag: rel_2_0_30~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65c12025a1b1a37186d55c1f8f204560037ebe5f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fixing ci errors

Change-Id: Ia1e3a8748a36dd3fa013707eae5ee4f97013d71b
(cherry picked from commit d85289b35ee6c2683eef378f1ea2fdea7f401ed9)
---

diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml
index 7fd142d225..2ca2b981d8 100644
--- a/.github/workflows/create-wheels.yaml
+++ b/.github/workflows/create-wheels.yaml
@@ -27,7 +27,8 @@ jobs:
           - compiled
         os:
           - "windows-2022"
-          - "macos-12"
+          # TODO: macos-14 uses arm macs (only python 3.10+) - make arm wheel on it
+          - "macos-13"
           - "ubuntu-22.04"
         linux_archs:
           # this is only meaningful on linux. windows and macos ignore exclude all but one arch
@@ -43,7 +44,7 @@ jobs:
         exclude:
           - os: "windows-2022"
             linux_archs: "aarch64"
-          - os: "macos-12"
+          - os: "macos-13"
             linux_archs: "aarch64"
 
       fail-fast: false
diff --git a/.github/workflows/run-on-pr.yaml b/.github/workflows/run-on-pr.yaml
index 0790c79330..aa67872e32 100644
--- a/.github/workflows/run-on-pr.yaml
+++ b/.github/workflows/run-on-pr.yaml
@@ -25,7 +25,7 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
-          - "3.11"
+          - "3.12"
         build-type:
           - "cext"
           - "nocext"
@@ -62,7 +62,7 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
-          - "3.11"
+          - "3.12"
         tox-env:
           - mypy
           - lint
diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
index 6eae9e8bc7..1d384294a0 100644
--- a/.github/workflows/run-test.yaml
+++ b/.github/workflows/run-test.yaml
@@ -29,6 +29,7 @@ jobs:
           - "ubuntu-latest"
           - "windows-latest"
           - "macos-latest"
+          - "macos-13"
         python-version:
           - "3.7"
           - "3.8"
@@ -43,6 +44,7 @@ jobs:
         architecture:
           - x64
           - x86
+          - arm64
 
         include:
           # autocommit tests fail on the ci for some reason
@@ -51,11 +53,31 @@ jobs:
           - os: "ubuntu-latest"
             pytest-args: "--dbdriver pysqlite --dbdriver aiosqlite"
 
+
         exclude:
-          # linux and osx do not have x86 python
+          # linux do not have x86 / arm64 python
+          - os: "ubuntu-latest"
+            architecture: x86
           - os: "ubuntu-latest"
+            architecture: arm64
+          # windows des not have arm64 python
+          - os: "windows-latest"
+            architecture: arm64
+          # macos: latests uses arm macs. only 3.10+; no x86/x64
+          - os: "macos-latest"
             architecture: x86
           - os: "macos-latest"
+            architecture: x64
+          - os: "macos-latest"
+            python-version: "3.7"
+          - os: "macos-latest"
+            python-version: "3.8"
+          - os: "macos-latest"
+            python-version: "3.9"
+          # 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
           - python-version: "pypy-3.9"
@@ -94,6 +116,7 @@ jobs:
         continue-on-error: ${{ matrix.python-version == 'pypy-3.9' }}
 
   run-test-arm64:
+    # Hopefully something native can be used at some point https://github.blog/changelog/2023-10-30-accelerate-your-ci-cd-with-arm-based-hosted-runners-in-github-actions/
     name: test-arm64-${{ matrix.python-version }}-${{ matrix.build-type }}-${{ matrix.os }}
     runs-on: ubuntu-latest
     strategy:
diff --git a/test/typing/plain_files/orm/typed_queries.py b/test/typing/plain_files/orm/typed_queries.py
index e5f513a7de..b1226da30f 100644
--- a/test/typing/plain_files/orm/typed_queries.py
+++ b/test/typing/plain_files/orm/typed_queries.py
@@ -97,7 +97,7 @@ def t_select_3() -> None:
     # awkwardnesses that aren't really worth it
     ua(id=1, name="foo")
 
-    # EXPECTED_TYPE: type[User]
+    # EXPECTED_RE_TYPE: [tT]ype\[.*\.User\]
     reveal_type(ua)
 
     stmt = select(ua.id, ua.name).filter(User.id == 5)
@@ -529,13 +529,13 @@ def t_aliased_fromclause() -> None:
 
     a4 = aliased(user_table)
 
-    # EXPECTED_TYPE: type[User]
+    # EXPECTED_RE_TYPE: [tT]ype\[.*\.User\]
     reveal_type(a1)
 
-    # EXPECTED_TYPE: type[User]
+    # EXPECTED_RE_TYPE: [tT]ype\[.*\.User\]
     reveal_type(a2)
 
-    # EXPECTED_TYPE: type[User]
+    # EXPECTED_RE_TYPE: [tT]ype\[.*\.User\]
     reveal_type(a3)
 
     # EXPECTED_TYPE: FromClause