From fc0d01ca719634e2a6244c2cf6db31eaeb7fbd54 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 14 Sep 2025 13:04:29 -0700
Subject: [PATCH 1/2] Update CI workflow to use 'ubuntu-latest' and
 'windows-latest'

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 644121a9..5e9f56a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   linux:
-    runs-on: ${{ matrix.PYTHON.OS || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.PYTHON.OS || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:
@@ -20,7 +20,7 @@ jobs:
           - {VERSION: "3.13-dev", NOXSESSION: "tests"}
           - {VERSION: "pypy-3.9", NOXSESSION: "tests"}
           - {VERSION: "pypy-3.10", NOXSESSION: "tests"}
-          - {VERSION: "3.11", NOXSESSION: "tests-wheel", OS: "windows-2022"}
+          - {VERSION: "3.11", NOXSESSION: "tests-wheel", OS: "windows-latest"}
           # -cryptography-main
           - {VERSION: "3.8", NOXSESSION: "tests-cryptography-main"}
           - {VERSION: "3.9", NOXSESSION: "tests-cryptography-main"}

From b3e248ea3bdb9f70bc1f59914ea7f88afa044ce1 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 14 Sep 2025 13:13:53 -0700
Subject: [PATCH 2/2] Update Python versions and OS in CI workflow

---
 .github/workflows/ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e9f56a9..c87258b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,13 +11,14 @@ jobs:
       matrix:
         PYTHON:
           # Base builds
-          - {VERSION: "3.7", NOXSESSION: "tests"}
+          - {VERSION: "3.7", NOXSESSION: "tests", OS: "ubuntu-22.04"}
           - {VERSION: "3.8", NOXSESSION: "tests"}
           - {VERSION: "3.9", NOXSESSION: "tests"}
           - {VERSION: "3.10", NOXSESSION: "tests"}
           - {VERSION: "3.11", NOXSESSION: "tests"}
           - {VERSION: "3.12", NOXSESSION: "tests"}
-          - {VERSION: "3.13-dev", NOXSESSION: "tests"}
+          - {VERSION: "3.13", NOXSESSION: "tests"}
+          - {VERSION: "3.14-dev", NOXSESSION: "tests"}
           - {VERSION: "pypy-3.9", NOXSESSION: "tests"}
           - {VERSION: "pypy-3.10", NOXSESSION: "tests"}
           - {VERSION: "3.11", NOXSESSION: "tests-wheel", OS: "windows-latest"}
@@ -27,17 +28,17 @@ jobs:
           - {VERSION: "3.10", NOXSESSION: "tests-cryptography-main"}
           - {VERSION: "3.11", NOXSESSION: "tests-cryptography-main"}
           - {VERSION: "3.12", NOXSESSION: "tests-cryptography-main"}
-          - {VERSION: "3.13-dev", NOXSESSION: "tests-cryptography-main"}
+          - {VERSION: "3.13", NOXSESSION: "tests-cryptography-main"}
           - {VERSION: "pypy-3.9", NOXSESSION: "tests-cryptography-main"}
           - {VERSION: "pypy-3.10", NOXSESSION: "tests-cryptography-main"}
           # -cryptography-minimum
-          - {VERSION: "3.7", NOXSESSION: "tests-cryptography-minimum"}
+          - {VERSION: "3.7", NOXSESSION: "tests-cryptography-minimum", OS: "ubuntu-22.04"}
           - {VERSION: "3.8", NOXSESSION: "tests-cryptography-minimum"}
           - {VERSION: "3.9", NOXSESSION: "tests-cryptography-minimum"}
           - {VERSION: "3.10", NOXSESSION: "tests-cryptography-minimum"}
           - {VERSION: "3.11", NOXSESSION: "tests-cryptography-minimum"}
           - {VERSION: "3.12", NOXSESSION: "tests-cryptography-minimum"}
-          - {VERSION: "3.13-dev", NOXSESSION: "tests-cryptography-minimum"}
+          - {VERSION: "3.13", NOXSESSION: "tests-cryptography-minimum"}
           - {VERSION: "pypy-3.10", NOXSESSION: "tests-cryptography-minimum"}
           # Cryptography wheels
           - {VERSION: "3.9", NOXSESSION: "tests-cryptography-minimum-wheel"}