py3.12 compat

mdavidsaver · Nov 7, 2023 · 9fef6ca · 9fef6ca
1 parent 5b5a8bc
commit 9fef6ca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.x']
+        python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.x']
         exclude:
           # actions/setup-python no longer provides...
           - os: ubuntu-latest
@@ -66,6 +66,7 @@ jobs:
           cat <<EOF > runit.sh
           #!/bin/sh
           set -e -x
+          ls -d /opt/python
           cd /io
           export PATH="/opt/python/${{ matrix.pyver }}/bin:\$PATH"
           which python

diff --git a/build_crasher.py b/build_crasher.py
@@ -2,6 +2,7 @@
 
 from __future__ import print_function
 
+import setuptools # allow to monkey path in setuptools._distutils
 from distutils.ccompiler import new_compiler
 import os
 import platform

diff --git a/ci_core_dumper/linux.py b/ci_core_dumper/linux.py
@@ -21,8 +21,11 @@
 import traceback
 import resource
 import subprocess as SP
-from distutils.spawn import find_executable
 from glob import glob
+try:
+    from distutils.spawn import find_executable # < 3.12
+except ImportError:
+    from shutil import which as find_executable # >= 3.3
 
 from . import CommonDumper, _root_dir