Merge pull request #125 from nicoddemus/fix-package-ci

Add support for Python 3.12

Author: nicoddemus

.github/workflows/test.yml

@@ -75,18 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
-        include:
-          - python: "3.7"
-            tox_env: "py37"
-          - python: "3.8"
-            tox_env: "py38"
-          - python: "3.9"
-            tox_env: "py39"
-          - python: "3.10"
-            tox_env: "py310"
-          - python: "3.11-dev"
-            tox_env: "py311"
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v2
@@ -115,4 +104,4 @@ jobs:
     - name: Test
       shell: bash
       run: |
-        tox run -e ${{ matrix.tox_env }} --installpkg `find dist/*.tar.gz`
+        tox run -e py --installpkg `find dist/*.tar.gz`

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Catch2: add support for catch version 3 ([#115](https://github.com/pytest-dev/pytest-cpp/pull/115))
 - Catch2: support exception handling ([#117](https://github.com/pytest-dev/pytest-cpp/pull/117))
+- Added support for Python 3.12.
 
 # 2.4.0 (2023-09-08)
 

setup.py

@@ -35,6 +35,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: C++",
         "Topic :: Software Development :: Quality Assurance",
         "Topic :: Software Development :: Testing",

tests/test_pytest_cpp.py

@@ -1,9 +1,9 @@
 import subprocess
 import sys
 import tempfile
+from shutil import which
 
 import pytest
-from distutils.spawn import find_executable
 
 from pytest_cpp import error
 from pytest_cpp.boost import BoostTestFacade
@@ -451,7 +451,7 @@ def test_argument_option_priority(testdir, exes):
 
 
 @pytest.mark.skipif(
-    not find_executable("valgrind") or not find_executable("catchsegv"),
+    not which("valgrind") or not which("catchsegv"),
     reason="Environment does not have required tools",
 )
 def test_google_cpp_harness_via_option(testdir, exes):
@@ -504,7 +504,7 @@ def test_boost_two_arguments_via_option(testdir, exes):
 
 
 @pytest.mark.skipif(
-    not find_executable("valgrind") or not find_executable("catchsegv"),
+    not which("valgrind") or not which("catchsegv"),
     reason="Environment does not have required tools",
 )
 def test_boost_cpp_harness_via_option(testdir, exes):