Merge 53788e60fa into 6da1331018

Ignore pylint errors caused by compatibility checks for six
* This is a temporary measure until we stop covering Python2 Signed-off-by: saito-hideki <saito@fgrep.org>
2026-01-11 07:05:27 +01:00 · 2025-09-29 07:30:33 +00:00 · 2025-09-29 16:30:19 +09:00
3 changed files with 5 additions and 2 deletions
--- a/.ansible-lint
+++ b/.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/
--- a/tests/sanity/ignore-2.20.txt
+++ b/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
--- a/tests/utils/shippable/sanity.sh
+++ b/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
Author	SHA1	Message	Date
Hideki Saito	15fbcaa609	Merge `53788e60fa` into `6da1331018`	2025-09-29 07:30:33 +00:00
saito-hideki	53788e60fa	Ignore pylint errors caused by compatibility checks for six * This is a temporary measure until we stop covering Python2 Signed-off-by: saito-hideki <saito@fgrep.org>	2025-09-29 16:30:19 +09:00