From 7314deab87df089523663ef342224a138fb5fd41 Mon Sep 17 00:00:00 2001
From: Jan Kuehle <jankuehle@google.com>
Date: Tue, 10 Sep 2024 07:15:51 -0700
Subject: [PATCH] Turn on OSS CI for 3.12 and add 3.12 to classifiers

PiperOrigin-RevId: 672951709
---
 .github/workflows/build.yml |  4 ++--
 .github/workflows/ci.yml    | 12 ++++++------
 setup.cfg                   |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0f55ba986..f13b56f4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
         platform:
           - manylinux_2_28_x86_64
           - manylinux_2_28_aarch64
-        pyver: ['cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311']
+        pyver: ['cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311', 'cp312-cp312']
     steps:
       - uses: actions/checkout@v4
         with:
@@ -57,7 +57,7 @@ jobs:
     runs-on: macos-13
     strategy:
       matrix:
-        python_version: ['3.8', '3.9', '3.10', '3.11']
+        python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e6f652ec..e80229a96 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,18 +15,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         experimental: [false]
         include:
           - os: macos-latest
-            python-version: '3.11'
+            python-version: '3.12'
             experimental: false
           - os: windows-latest
-            python-version: '3.11'
-            experimental: true
-          - os: ubuntu-20.04
             python-version: '3.12'
             experimental: true
+          # - os: ubuntu-20.04
+          #   python-version: '3.13'
+          #   experimental: true
     steps:
     - uses: actions/checkout@v4
       with:
@@ -51,6 +51,6 @@ jobs:
 
     - name: Run Tests
       env:
-        LINT: ${{ runner.os == 'Linux' && matrix.python-version == '3.11' }}
+        LINT: ${{ runner.os == 'Linux' && matrix.python-version == '3.12' }}
       run: python build_scripts/ci_script.py
       continue-on-error: ${{ matrix.experimental }}
diff --git a/setup.cfg b/setup.cfg
index 8ef349920..94f80ba5b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,7 @@ classifiers =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Software Development