Merge 53788e60fa into 6da1331018

* This is a temporary measure until we stop covering Python2

Signed-off-by: saito-hideki <saito@fgrep.org>

.ansible-lint

@@ -4,7 +4,7 @@
 # SPDX-FileCopyrightText: 2024, Ansible Project
 
 skip_list:
-  - meta-runtime[unsupported-version]  # Tis rule doesn't make any sense
+  - meta-runtime[unsupported-version]  # This rule doesn't make any sense
   - fqcn[deep]  # This rule produces false positives for files in tests/unit/plugins/action/fixtures/
 exclude_paths:
   - changelogs/

tests/sanity/ignore-2.20.txt

@@ -1 +1,4 @@
 tests/utils/shippable/timing.py shebang
+tests/unit/mock/procenv.py pylint:ansible-bad-import-from
+tests/unit/mock/yaml_helper.py pylint:ansible-bad-import-from
+tests/unit/modules/conftest.py pylint:ansible-bad-import-from

tests/utils/shippable/sanity.sh

@@ -18,4 +18,4 @@ fi
 
 # shellcheck disable=SC2086
 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
-    --docker --base-branch "${base_branch}" --allow-disabled
+    --docker --base-branch "${base_branch}" --allow-disabled --debug