Skip to content

Commit d6add64

Browse files
Drop support for pytest<6 (#86)
1 parent 8358442 commit d6add64

File tree

4 files changed

+11
-23
lines changed

4 files changed

+11
-23
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
- main
88
pull_request:
99

10+
env:
11+
FORCE_COLOR: "1"
12+
1013
jobs:
1114
test:
1215
strategy:
@@ -38,22 +41,6 @@ jobs:
3841
- name: Test packaging
3942
run: tox -e pkg
4043

41-
- name: Run tests with PyTest 4
42-
run: tox
43-
if: "!startsWith(matrix.python-version, '3.1')"
44-
env:
45-
PLATFORM: ${{ matrix.os }}
46-
PYTEST_MAJOR_VERSION: 4
47-
PYTEST_PLUGINS: pytest_github_actions_annotate_failures
48-
49-
- name: Run tests with PyTest 5
50-
run: tox
51-
if: "!startsWith(matrix.python-version, '3.1')"
52-
env:
53-
PLATFORM: ${{ matrix.os }}
54-
PYTEST_MAJOR_VERSION: 5
55-
PYTEST_PLUGINS: pytest_github_actions_annotate_failures
56-
5744
- name: Run tests with PyTest 6
5845
run: tox
5946
env:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Incompatible changes
6+
7+
- Require pytest 6+ #86 (thanks to @edgarrmondragon)
8+
39
## 0.2.0 (2023-05-04)
410

511
### Incompatible changes

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ classifiers = [
3939
]
4040
keywords = ["ansible", "testing", "molecule", "plugin"]
4141
dependencies = [
42-
"pytest>=4.0.0"
42+
"pytest>=6.0.0"
4343
]
4444

4545
[project.urls]

tox.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[tox]
22
envlist =
3-
py{37,38,39}-pytest{4,5,6,7}-{linux,windows}
4-
py{310,311,312}-pytest{6,7}-{linux,windows}
3+
py{37,38,39,310,311,312}-pytest{6,7}-{linux,windows}
54
pkg
65

76
[gh-actions]
@@ -19,16 +18,12 @@ PLATFORM =
1918
windows-latest: windows
2019

2120
PYTEST_MAJOR_VERSION =
22-
4: pytest4
23-
5: pytest5
2421
6: pytest6
2522
7: pytest7
2623

2724
[testenv]
2825
deps =
2926
-rrequirements.txt
30-
pytest4: pytest>=4.0.0,<5.0.0
31-
pytest5: pytest>=5.0.0,<6.0.0
3227
pytest6: pytest>=6.0.0,<7.0.0
3328
pytest7: pytest>=7.0.0,<7.4.0
3429

0 commit comments

Comments
 (0)