Skip to content

Commit

Permalink
Merge pull request #148 from pytest-dev/release-2.6.0
Browse files Browse the repository at this point in the history
Release 2.6.0
  • Loading branch information
nicoddemus authored Sep 18, 2024
2 parents 8ffb245 + 3e6175e commit 1f40b99
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 21 deletions.
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Keep GitHub Actions up to date with GitHub's Dependabot...
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
version: 2
updates:
- package-ecosystem: github-actions
directory: /
groups:
github-actions:
patterns:
- "*" # Group all Actions updates into a single larger pull request
schedule:
interval: weekly
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ repos:
files: src/
args: []
additional_dependencies:
- pytest>=7
- pytest
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# UNRELEASED
# 2.6.0

*2024-09-17*

- Catch2: recognize `FAIL()` calls ([#147](https://github.com/pytest-dev/pytest-cpp/pull/147)).
- Dropped support for EOL Python 3.7.

# 2.5.0 (2023-11-01)

Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = ["setuptools>=61"]
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@
entry_points={
"pytest11": ["cpp = pytest_cpp.plugin"],
},
install_requires=[
"pytest >=7.0",
"colorama",
],
python_requires=">=3.7",
install_requires=["pytest"],
python_requires=">=3.8",
author="Bruno Oliveira",
author_email="[email protected]",
description="Use pytest's runner to discover and execute C++ tests",
Expand All @@ -30,7 +27,6 @@
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
15 changes: 4 additions & 11 deletions src/pytest_cpp/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from fnmatch import fnmatch
from pathlib import Path
from typing import Any
from typing import cast
from typing import Iterator
from typing import Sequence
from typing import Type
Expand Down Expand Up @@ -143,11 +142,8 @@ def from_parent( # type:ignore[override]
arguments: Sequence[str],
**kwargs: Any,
) -> CppFile:
return cast(
CppFile,
super().from_parent(
parent=parent, path=path, facade=facade, arguments=arguments
),
return super().from_parent(
parent=parent, path=path, facade=facade, arguments=arguments
)

def collect(self) -> Iterator[CppItem]:
Expand Down Expand Up @@ -188,11 +184,8 @@ def from_parent( # type:ignore[override]
arguments: Sequence[str],
**kwargs: Any,
) -> CppItem:
return cast(
CppItem,
super().from_parent(
name=name, parent=parent, facade=facade, arguments=arguments, **kwargs
),
return super().from_parent(
name=name, parent=parent, facade=facade, arguments=arguments, **kwargs
)

def runtest(self) -> None:
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{37, 38, 39, 310, 311}
envlist = py{38, 39, 310, 311, 312}

[testenv]
deps=
Expand Down

0 comments on commit 1f40b99

Please sign in to comment.