Skip to content

Commit 1f40b99

Browse files
authored
Merge pull request #148 from pytest-dev/release-2.6.0
Release 2.6.0
2 parents 8ffb245 + 3e6175e commit 1f40b99

File tree

8 files changed

+29
-21
lines changed

8 files changed

+29
-21
lines changed

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Keep GitHub Actions up to date with GitHub's Dependabot...
2+
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
3+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
4+
version: 2
5+
updates:
6+
- package-ecosystem: github-actions
7+
directory: /
8+
groups:
9+
github-actions:
10+
patterns:
11+
- "*" # Group all Actions updates into a single larger pull request
12+
schedule:
13+
interval: weekly

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
strategy:
7676
fail-fast: false
7777
matrix:
78-
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
78+
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
7979

8080
steps:
8181
- uses: actions/[email protected]

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ repos:
4040
files: src/
4141
args: []
4242
additional_dependencies:
43-
- pytest>=7
43+
- pytest

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# UNRELEASED
1+
# 2.6.0
2+
3+
*2024-09-17*
24

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

58
# 2.5.0 (2023-11-01)
69

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
build-backend = "setuptools.build_meta"
3+
requires = ["setuptools>=61"]

setup.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
entry_points={
1111
"pytest11": ["cpp = pytest_cpp.plugin"],
1212
},
13-
install_requires=[
14-
"pytest >=7.0",
15-
"colorama",
16-
],
17-
python_requires=">=3.7",
13+
install_requires=["pytest"],
14+
python_requires=">=3.8",
1815
author="Bruno Oliveira",
1916
author_email="[email protected]",
2017
description="Use pytest's runner to discover and execute C++ tests",
@@ -30,7 +27,6 @@
3027
"License :: OSI Approved :: MIT License",
3128
"Operating System :: OS Independent",
3229
"Programming Language :: Python :: 3",
33-
"Programming Language :: Python :: 3.7",
3430
"Programming Language :: Python :: 3.8",
3531
"Programming Language :: Python :: 3.9",
3632
"Programming Language :: Python :: 3.10",

src/pytest_cpp/plugin.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from fnmatch import fnmatch
77
from pathlib import Path
88
from typing import Any
9-
from typing import cast
109
from typing import Iterator
1110
from typing import Sequence
1211
from typing import Type
@@ -143,11 +142,8 @@ def from_parent( # type:ignore[override]
143142
arguments: Sequence[str],
144143
**kwargs: Any,
145144
) -> CppFile:
146-
return cast(
147-
CppFile,
148-
super().from_parent(
149-
parent=parent, path=path, facade=facade, arguments=arguments
150-
),
145+
return super().from_parent(
146+
parent=parent, path=path, facade=facade, arguments=arguments
151147
)
152148

153149
def collect(self) -> Iterator[CppItem]:
@@ -188,11 +184,8 @@ def from_parent( # type:ignore[override]
188184
arguments: Sequence[str],
189185
**kwargs: Any,
190186
) -> CppItem:
191-
return cast(
192-
CppItem,
193-
super().from_parent(
194-
name=name, parent=parent, facade=facade, arguments=arguments, **kwargs
195-
),
187+
return super().from_parent(
188+
name=name, parent=parent, facade=facade, arguments=arguments, **kwargs
196189
)
197190

198191
def runtest(self) -> None:

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{37, 38, 39, 310, 311}
2+
envlist = py{38, 39, 310, 311, 312}
33

44
[testenv]
55
deps=

0 commit comments

Comments
 (0)