From ad83c3eae7efa97e40fa52d6ee71d98309e4a33a Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Mon, 23 Dec 2024 17:05:34 +0100
Subject: [PATCH] Drop support for Python 3.7

---
 README.md                                            |  6 +++---
 changelogs/fragments/botocore.yml                    |  4 ++++
 tests/config.yml                                     |  2 +-
 tests/unit/module_utils/test_rds.py                  |  3 ---
 .../modules/ec2_security_group/test_expand_rules.py  | 12 ------------
 tox.ini                                              |  8 +++++---
 6 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 8da32694108..f952fcc3897 100644
--- a/README.md
+++ b/README.md
@@ -32,11 +32,11 @@ Tested with the Ansible Core >= 2.15.0 versions, and the current development ver
 
 This collection depends on the AWS SDK for Python (Boto3 and Botocore).  Due to the
 [AWS SDK Python Support Policy](https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/)
-this collection requires Python 3.7 or greater.
+this collection requires Python 3.8 or greater.
 
 Amazon has also announced the planned end of support for
-[Python less than 3.8](https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/).
-As such support for Python less than 3.8 will be removed in a release after 2024-12-01.
+[Python less than 3.9](https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/).
+As such support for Python less than 3.9 will be removed in a release after 2026-05-01.
 
 <!---
 ### End of Support by Python Versions:
diff --git a/changelogs/fragments/botocore.yml b/changelogs/fragments/botocore.yml
index be1956bc610..0bf6ab28fb5 100644
--- a/changelogs/fragments/botocore.yml
+++ b/changelogs/fragments/botocore.yml
@@ -5,3 +5,7 @@ major_changes:
     with older versions of the AWS SDK, however compatibility with older versions
     of the SDK is not guaranteed and will not be tested. When using older versions
     of the SDK a warning will be emitted by Ansible (https://github.com/ansible-collections/amazon.aws/pull/2426).
+  - amazon.aws collection - due to the AWS SDKs announcing the end of support for Python less than 3.8
+    (https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/) support for Python
+    less than 3.8 by this collection was deprecated in release 6.0.0 and removed in release 10.0.0.
+    (https://github.com/ansible-collections/amazon.aws/pull/2426).
diff --git a/tests/config.yml b/tests/config.yml
index 782285475d5..340add1aadd 100644
--- a/tests/config.yml
+++ b/tests/config.yml
@@ -1,3 +1,3 @@
 ---
 modules:
-  python_requires: ">=3.7"
+  python_requires: ">=3.8"
diff --git a/tests/unit/module_utils/test_rds.py b/tests/unit/module_utils/test_rds.py
index d58884e3474..4d2dc06ca5a 100644
--- a/tests/unit/module_utils/test_rds.py
+++ b/tests/unit/module_utils/test_rds.py
@@ -9,9 +9,6 @@
 
 import pytest
 
-if sys.version_info < (3, 7):
-    pytest.skip("contextlib.nullcontext was introduced in Python 3.7", allow_module_level=True)
-
 from contextlib import nullcontext
 
 try:
diff --git a/tests/unit/plugins/modules/ec2_security_group/test_expand_rules.py b/tests/unit/plugins/modules/ec2_security_group/test_expand_rules.py
index 1abfd526cdf..d341430ffa3 100644
--- a/tests/unit/plugins/modules/ec2_security_group/test_expand_rules.py
+++ b/tests/unit/plugins/modules/ec2_security_group/test_expand_rules.py
@@ -187,10 +187,6 @@ def test_expand_ports_list(rule, expected):
     assert ec2_security_group_module.expand_ports_list(rule) == expected
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 7),
-    reason="requires Python 3.7 or higher - sentinel doesn't behave well with deepcopy in Python 3.6",
-)
 @pytest.mark.parametrize("source_type", sorted(ec2_security_group_module.SOURCE_TYPES_ALL))
 def test_strip_rule_source(source_type):
     rule = {source_type: sentinel.SOURCE_VALUE}
@@ -202,10 +198,6 @@ def test_strip_rule_source(source_type):
     assert rule == {source_type: sentinel.SOURCE_VALUE, "sentinel": sentinel.SENTINEL_VALUE}
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 7),
-    reason="requires Python 3.7 or higher - sentinel doesn't behave well with deepcopy in Python 3.6",
-)
 @pytest.mark.parametrize("port_type", sorted(ec2_security_group_module.PORT_TYPES_ALL))
 def test_strip_rule_port(port_type):
     rule = {port_type: sentinel.PORT_VALUE}
@@ -217,10 +209,6 @@ def test_strip_rule_port(port_type):
     assert rule == {port_type: sentinel.PORT_VALUE, "sentinel": sentinel.SENTINEL_VALUE}
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 7),
-    reason="requires Python 3.7 or higher - sentinel doesn't behave well with deepcopy in Python 3.6",
-)
 @pytest.mark.parametrize("rule, expected", RULE_EXPANSION)
 def test_rule_expand(rule, expected):
     assert ec2_security_group_module.expand_rule(rule) == expected
diff --git a/tox.ini b/tox.ini
index 9b7cb4fbdff..e5bfbf03a16 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@
 skipsdist = True
 skip_missing_interpreters = True
 envlist =
-    clean
     ansible{2.15}-py{39,310,311}-{with_constraints,without_constraints}
     ansible{2.16,2.17}-py{310,311,312}-{with_constraints,without_constraints}
     ansible{2.18}-py{311,312,313}-{with_constraints,without_constraints}
@@ -60,11 +59,13 @@ commands =
         {posargs:tests/}
 
 [testenv:clean]
-description = Remove coverage test data
+description = Remove test results and caches
+allowlist_externals = rm
 deps = coverage
 skip_install = true
 commands =
     coverage erase
+    rm -rf tests/output/ htmlcov/ .mypy_cache/ complexity/
 
 [testenv:complexity-report]
 labels = lint
@@ -198,7 +199,8 @@ commands_pre =
 commands =
   cd {[mypy]full_tmp_path}
   mypy \
+    --check-untyped-defs \
     --namespace-packages --explicit-package-bases \
     --follow-imports silent \
-    {posargs:plugins/module_utils}
+    {posargs:plugins/module_utils plugins/plugin_utils}
     # start with module_utils, expand later