Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions tests/test_pytest_cpp.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down