From 10dd524184fb772c604eacd6d496c5fc3a97d637 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@cs.cmu.edu>
Date: Sun, 1 Oct 2023 22:49:54 -0500
Subject: [PATCH] Add Python 3.12

setuptools is no longer installed along with Python.

Signed-off-by: Benjamin Gilbert <bgilbert@cs.cmu.edu>
---
 .github/workflows/python.yml | 12 ++++++------
 setup.py                     |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 936ed439..1a925ffd 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
     - uses: pre-commit/action@v3.0.0
   tests:
     name: Tests
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
     steps:
     - name: Check out repo
       uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
     - name: Install Python tools
       run: |
         python -m pip install --upgrade pip
-        pip install jinja2 pytest
+        pip install jinja2 pytest setuptools
     - name: Install OpenSlide
       run: |
         case "${{ matrix.os }}" in
@@ -69,7 +69,7 @@ jobs:
         shell: bash
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
         python-arch: [x86, x64]
     steps:
     - name: Check out repo
@@ -82,7 +82,7 @@ jobs:
     - name: Install Python tools
       run: |
         python -m pip install --upgrade pip
-        pip install flask pytest wheel
+        pip install flask pytest setuptools wheel
         # Current Pillow releases don't have 32-bit wheels
         # https://github.com/python-pillow/Pillow/issues/7251
         pip install Pillow --only-binary=:all:
@@ -133,7 +133,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
     - name: Install Python tools
       run: |
         python -m pip install --upgrade pip
diff --git a/setup.py b/setup.py
index 6c182648..34a71afc 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Scientific/Engineering :: Bio-Informatics',
     ],
     python_requires='>=3.8',