Add Python 3.12 support (#802)

* Add Python 3.12 support * Use shutil in tests after deprecating distutils in python 3.12
jazzband · Dec 14, 2023 · b9e6356 · b9e6356
1 parent c286019
commit b9e6356
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git 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', 'pypy-3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.10']
         django-version: ['3.2', '4.1', '4.2', 'main']
         exclude:
           - python-version: '3.8'
@@ -28,6 +28,10 @@ jobs:
             django-version: '3.2'
           - python-version: '3.11'
             django-version: '3.2'
+          - python-version: '3.12'
+            django-version: '3.2'
+          - python-version: '3.12'
+            django-version: '4.1'
 
     steps:
     - uses: actions/checkout@v3

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -8,6 +8,7 @@ Unreleased
 * Use Pypy 3.10
 * Drop support for Python 3.7
 * Drop support for Django 2
+* Add Python 3.12 support
 
 2.1.0
 =====

diff --git a/setup.py b/setup.py
@@ -36,6 +36,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Utilities",
         "Topic :: Software Development :: Libraries :: Python Modules",

diff --git a/tests/settings.py b/tests/settings.py
@@ -1,6 +1,6 @@
-import distutils.spawn
 import glob
 import os
+import shutil
 
 
 def local_path(path):
@@ -142,9 +142,9 @@ def local_path(path):
 
 NODE_MODULES_PATH = local_path("../node_modules")
 NODE_BIN_PATH = os.path.join(NODE_MODULES_PATH, ".bin")
-NODE_EXE_PATH = distutils.spawn.find_executable("node")
-JAVA_EXE_PATH = distutils.spawn.find_executable("java")
-CSSTIDY_EXE_PATH = distutils.spawn.find_executable("csstidy")
+NODE_EXE_PATH = shutil.which("node")
+JAVA_EXE_PATH = shutil.which("java")
+CSSTIDY_EXE_PATH = shutil.which("csstidy")
 HAS_NODE = bool(NODE_EXE_PATH)
 HAS_JAVA = bool(JAVA_EXE_PATH)
 HAS_CSSTIDY = bool(CSSTIDY_EXE_PATH)

diff --git a/tox.ini b/tox.ini
@@ -3,6 +3,7 @@ envlist =
   pypy3-dj{32,41,42}
   py{38,39,310,311}-dj32
   py{39,310,311}-dj{41,42,main}
+  py{312}-dj{42,main}
   docs
 
 [gh-actions]
@@ -11,6 +12,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
     pypy3: pypy3
 
 [gh-actions:env]
@@ -27,6 +29,7 @@ basepython =
   py39: python3.9
   py310: python3.10
   py311: python3.11
+  py312: python3.12
 deps =
   pypy3: mock
   dj32: Django>=3.2,<3.3