ci: fix more ubuntu-24.04 failures (PyO3#4610)

* ci: fix more ubuntu-24.04 failures * use 22.04 to test 3.7 * disable zoneinfo test on free-threading
KLMatlock · Oct 10, 2024 · eacebb8 · eacebb8
1 parent 96da64b
commit eacebb8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -312,6 +312,15 @@ jobs:
                 python-architecture: "x64",
                 rust-target: "x86_64-apple-darwin",
               }
+          # ubuntu-latest (24.04) no longer supports 3.7, so run on 22.04
+          - rust: stable
+            python-version: "3.7"
+            platform:
+              {
+                os: "ubuntu-22.04",
+                python-architecture: "x64",
+                rust-target: "x86_64-unknown-linux-gnu",
+              }
 
           # arm64 macOS Python not available on GitHub Actions until 3.10
           # so backfill 3.7-3.9 with x64 macOS runners
@@ -341,6 +350,9 @@ jobs:
               }
 
         exclude:
+          # ubuntu-latest (24.04) no longer supports 3.7
+          - python-version: "3.7"
+            platform: { os: "ubuntu-latest" }
           # arm64 macOS Python not available on GitHub Actions until 3.10
           - rust: stable
             python-version: "3.7"
@@ -572,6 +584,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - uses: Swatinem/rust-cache@v2
         with:
           save-if: ${{ github.event_name != 'merge_group' }}
@@ -641,6 +656,9 @@ jobs:
             target: "x86_64-apple-darwin"
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces:

diff --git a/src/conversions/chrono_tz.rs b/src/conversions/chrono_tz.rs
@@ -114,6 +114,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(Py_GIL_DISABLED))] // https://github.com/python/cpython/issues/116738#issuecomment-2404360445
     fn test_into_pyobject() {
         Python::with_gil(|py| {
             let assert_eq = |l: Bound<'_, PyAny>, r: Bound<'_, PyAny>| {