Skip to content

Commit 3f59eda

Browse files
authored
Merge branch 'main' into drop-py37
2 parents 5195693 + 8646218 commit 3f59eda

File tree

4 files changed

+7
-23
lines changed

4 files changed

+7
-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:
@@ -37,22 +40,6 @@ jobs:
3740
- name: Test packaging
3841
run: tox -e pkg
3942

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

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Incompatible changes
66

77
- Require python 3.8+ #87 (thanks to @edgarrmondragon)
8+
- Require pytest 6+ #86 (thanks to @edgarrmondragon)
89

910
## 0.2.0 (2023-05-04)
1011

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ classifiers = [
2929
"Programming Language :: Python :: 3.9",
3030
"Programming Language :: Python :: 3.10",
3131
"Programming Language :: Python :: 3.11",
32+
"Programming Language :: Python :: 3.12",
3233
"Programming Language :: Python :: 3 :: Only",
3334
"Programming Language :: Python",
3435
"Topic :: System :: Systems Administration",
@@ -38,7 +39,7 @@ classifiers = [
3839
]
3940
keywords = ["ansible", "testing", "molecule", "plugin"]
4041
dependencies = [
41-
"pytest>=4.0.0"
42+
"pytest>=6.0.0"
4243
]
4344

4445
[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{38,39}-pytest{4,5,6,7}-{linux,windows}
4-
py{310,311,312}-pytest{6,7}-{linux,windows}
3+
py{38,39,310,311,312}-pytest{6,7}-{linux,windows}
54
pkg
65

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

2019
PYTEST_MAJOR_VERSION =
21-
4: pytest4
22-
5: pytest5
2320
6: pytest6
2421
7: pytest7
2522

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

0 commit comments

Comments
 (0)