From 64c02f838f675ef6822ce3108739b073ff13f5e4 Mon Sep 17 00:00:00 2001
From: Albert Wang <git@albertyw.com>
Date: Sat, 25 Nov 2023 18:40:00 -0500
Subject: [PATCH] Support python 3.12 (#683)

* Support python 3.12

* Ensure setuptools is in the python3.12 environment
---
 .github/workflows/test.yml | 8 +++++++-
 README.md                  | 2 +-
 setup.py                   | 1 +
 tox.ini                    | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f88c185e..f526fcfc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         django-version: ['3.2', '4.1', 'main']
         postgres-version: ['11', '12']
         mariadb-version: ['10.3', '10.4']
@@ -17,6 +17,12 @@ jobs:
           # Django <=4.0 doesn't support python 3.11 (https://docs.djangoproject.com/en/4.1/faq/install/)
           - python-version: '3.11'
             django-version: '3.2'
+          - python-version: '3.12'
+            django-version: '3.2'
+
+          # Django <=4.1 doesn't support python 3.12 (https://docs.djangoproject.com/en/4.1/faq/install/)
+          - python-version: '3.12'
+            django-version: '4.1'
 
           # only test Django dev with PostgreSQL 12 and MariaDB 10.4
           - django-version: '3.2'
diff --git a/README.md b/README.md
index a56a7ad5..3728ff84 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Silk is a live profiling and inspection tool for the Django framework. Silk inte
 Silk has been tested with:
 
 * Django: 3.2, 4.1
-* Python: 3.8, 3.9, 3.10, 3.11
+* Python: 3.8, 3.9, 3.10, 3.11, 3.12
 
 ## Installation
 
diff --git a/setup.py b/setup.py
index 9ee36cb4..1bc90a5b 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,7 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
diff --git a/tox.ini b/tox.ini
index ba840192..c7834f2d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [gh-actions:env]
 DJANGO =
@@ -16,6 +17,7 @@ envlist =
     py{38,39,310}-dj32-{sqlite3,mysql,postgresql}
     py{38,39,310}-dj{40,41,main}-{sqlite3,mysql,postgresql}
     py311-dj{41,main}-{sqlite3,mysql,postgresql}
+    py312-dj{main}-{sqlite3,mysql,postgresql}
 
 [testenv]
 usedevelop = True
@@ -29,6 +31,7 @@ deps =
     dj32: django>=3.2,<3.3
     dj41: django>=4.1,<4.2
     djmain: https://github.com/django/django/archive/main.tar.gz
+    py312: setuptools
 setenv =
     PYTHONPATH={toxinidir}:{toxinidir}
     PYTHONDONTWRITEBYTECODE=1