From 46080b5dec3dc5b7353a8c18d093e0f2989ca5a3 Mon Sep 17 00:00:00 2001
From: Aliaksei Urbanski <aliaksei.urbanski@gmail.com>
Date: Tue, 5 Dec 2023 23:47:18 +0300
Subject: [PATCH] Ensure support for Python 3.12 and PyPy 3.8-3.10

These changes:
  * enable testing for Python 3.12 and PyPy 3.8-3.10
  * update classifiers at setup.cfg
  * add a news fragment
---
 .github/workflows/ci-cd.yml | 23 ++++++++++++++---------
 CHANGES/553.feature         |  1 +
 setup.cfg                   |  3 +++
 tox.ini                     |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 CHANGES/553.feature

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index d9dd8675..b07c0fe4 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -67,7 +67,15 @@ jobs:
     needs: [lint]
     strategy:
       matrix:
-        pyver: ['3.8', '3.9', '3.10', '3.11']
+        pyver:
+          - '3.12'
+          - '3.11'
+          - '3.10'
+          - '3.9'
+          - '3.8'
+          - 'pypy3.10'
+          - 'pypy3.9'
+          - 'pypy3.8'
         no-extensions: ['', 'Y']
         experimental: [false]
         os: [ubuntu, macos, windows]
@@ -76,15 +84,12 @@ jobs:
             no-extensions: 'Y'
           - os: windows
             no-extensions: 'Y'
-        include:
-          - pyver: 3.12-dev
+          - pyver: pypy3.10
+            no-extensions: ''
+          - pyver: pypy3.9
+            no-extensions: ''
+          - pyver: pypy3.8
             no-extensions: ''
-            experimental: true
-            os: ubuntu
-          - pyver: 3.12-dev
-            no-extensions: 'Y'
-            experimental: true
-            os: ubuntu
       fail-fast: false
     runs-on: ${{ matrix.os }}-latest
     timeout-minutes: 15
diff --git a/CHANGES/553.feature b/CHANGES/553.feature
new file mode 100644
index 00000000..3f37d246
--- /dev/null
+++ b/CHANGES/553.feature
@@ -0,0 +1 @@
+Ensure support for Python 3.12 and PyPy 3.8-3.10.
diff --git a/setup.cfg b/setup.cfg
index 6353168b..960ff870 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,6 +28,9 @@ 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
+  Programming Language :: Python :: Implementation :: PyPy
   Development Status :: 5 - Production/Stable
   Operating System :: POSIX
   Operating System :: MacOS :: MacOS X
diff --git a/tox.ini b/tox.ini
index a49261b2..24bd21c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 
-envlist = check, clean, {py38,py39,py310,py311,py312}-{cython,pure}, report
+envlist = check, clean, py3{12,11,10,9,8}-{cython,pure}, pypy3{10,9,8}-pure, report
 
 [testenv]