From a0dd904c7a843a7cf89ff0565f7b7687c076464f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Ram=C3=ADrez-Mondrag=C3=B3n?= <edgarrm358@gmail.com>
Date: Wed, 3 Jul 2024 22:04:10 -0600
Subject: [PATCH] Drop support for pytest<6

---
 .github/workflows/test.yml | 19 +++----------------
 pyproject.toml             |  2 +-
 tox.ini                    |  7 +------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bffe4f0..cf750c5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,6 +7,9 @@ on:
       - main
   pull_request:
 
+env:
+  FORCE_COLOR: "1"
+
 jobs:
   test:
     strategy:
@@ -38,22 +41,6 @@ jobs:
     - name: Test packaging
       run: tox -e pkg
 
-    - name: Run tests with PyTest 4
-      run: tox
-      if: "!startsWith(matrix.python-version, '3.1')"
-      env:
-        PLATFORM: ${{ matrix.os }}
-        PYTEST_MAJOR_VERSION: 4
-        PYTEST_PLUGINS: pytest_github_actions_annotate_failures
-
-    - name: Run tests with PyTest 5
-      run: tox
-      if: "!startsWith(matrix.python-version, '3.1')"
-      env:
-        PLATFORM: ${{ matrix.os }}
-        PYTEST_MAJOR_VERSION: 5
-        PYTEST_PLUGINS: pytest_github_actions_annotate_failures
-
     - name: Run tests with PyTest 6
       run: tox
       env:
diff --git a/pyproject.toml b/pyproject.toml
index 7e3ba1e..7bb532d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,7 +39,7 @@ classifiers = [
 ]
 keywords = ["ansible", "testing", "molecule", "plugin"]
 dependencies = [
-    "pytest>=4.0.0"
+    "pytest>=6.0.0"
 ]
 
 [project.urls]
diff --git a/tox.ini b/tox.ini
index 4eb5c52..0536448 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39}-pytest{4,5,6,7}-{linux,windows}
-    py{310,311,312}-pytest{6,7}-{linux,windows}
+    py{37,38,39,310,311,312}-pytest{6,7}-{linux,windows}
     pkg
 
 [gh-actions]
@@ -19,16 +18,12 @@ PLATFORM =
     windows-latest: windows
 
 PYTEST_MAJOR_VERSION =
-    4: pytest4
-    5: pytest5
     6: pytest6
     7: pytest7
 
 [testenv]
 deps =
     -rrequirements.txt
-    pytest4: pytest>=4.0.0,<5.0.0
-    pytest5: pytest>=5.0.0,<6.0.0
     pytest6: pytest>=6.0.0,<7.0.0
     pytest7: pytest>=7.0.0,<7.4.0