From 82671680e3642721c8a5c95187bc7e15550b9709 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Fri, 14 Jan 2022 10:29:21 -0500 Subject: [PATCH 1/3] Respect linter rule F811 for trivial re-definition --- awx/main/models/events.py | 3 +-- awx/main/utils/common.py | 1 - tox.ini | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/main/models/events.py b/awx/main/models/events.py index 0e516aa669..f953e7ca61 100644 --- a/awx/main/models/events.py +++ b/awx/main/models/events.py @@ -541,8 +541,7 @@ class JobEvent(BasePlaybookEvent): return job = self.job - from awx.main.models import Host, JobHostSummary # circular import - from awx.main.models import Host, JobHostSummary, HostMetric + from awx.main.models import Host, JobHostSummary, HostMetric # circular import all_hosts = Host.objects.filter(pk__in=self.host_map.values()).only('id', 'name') existing_host_ids = set(h.id for h in all_hosts) diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index bc66b2dc99..cf80559e48 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -10,7 +10,6 @@ import os import subprocess import re import stat -import subprocess import urllib.parse import threading import contextlib diff --git a/tox.ini b/tox.ini index 820324d2d3..e71d910bc9 100644 --- a/tox.ini +++ b/tox.ini @@ -13,5 +13,5 @@ commands = yamllint -s . [flake8] -select = F401,F402,F821,F823,F841 +select = F401,F402,F821,F823,F841,F811 exclude = awx/ui/node_modules,awx/ui/node_modules,env,awx_collection_build From 02e18cf919dc763c813f7aef6be54272688d3c4e Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Fri, 14 Jan 2022 10:41:24 -0500 Subject: [PATCH 2/3] Fix more F811 linter violations --- awx_collection/plugins/lookup/schedule_rrule.py | 6 +----- awx_collection/test/awx/test_credential_input_source.py | 2 +- awx_collection/test/awx/test_workflow_job_template.py | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/awx_collection/plugins/lookup/schedule_rrule.py b/awx_collection/plugins/lookup/schedule_rrule.py index e1079e44ac..c72a9ee6dc 100644 --- a/awx_collection/plugins/lookup/schedule_rrule.py +++ b/awx_collection/plugins/lookup/schedule_rrule.py @@ -90,7 +90,6 @@ from ansible.module_utils.six import raise_from from ansible.plugins.lookup import LookupBase from ansible.errors import AnsibleError from datetime import datetime -from dateutil import rrule try: import pytz @@ -132,10 +131,7 @@ class LookupModule(LookupBase): # plugin constructor def __init__(self, *args, **kwargs): if LIBRARY_IMPORT_ERROR: - raise_from( - AnsibleError('{0}'.format(LIBRARY_IMPORT_ERROR)), - LIBRARY_IMPORT_ERROR - ) + raise_from(AnsibleError('{0}'.format(LIBRARY_IMPORT_ERROR)), LIBRARY_IMPORT_ERROR) super().__init__(*args, **kwargs) @staticmethod diff --git a/awx_collection/test/awx/test_credential_input_source.py b/awx_collection/test/awx/test_credential_input_source.py index 32864da63c..5978939af9 100644 --- a/awx_collection/test/awx/test_credential_input_source.py +++ b/awx_collection/test/awx/test_credential_input_source.py @@ -259,7 +259,7 @@ def source_cred_aim_alt(aim_cred_type): @pytest.mark.django_db -def test_aim_credential_source(run_module, admin_user, organization, source_cred_aim, source_cred_aim_alt, silence_deprecation): +def test_aim_credential_source_change_source(run_module, admin_user, organization, source_cred_aim, source_cred_aim_alt, silence_deprecation): ct = CredentialType.defaults['ssh']() ct.save() tgt_cred = Credential.objects.create(name='Test Machine Credential', organization=organization, credential_type=ct, inputs={'username': 'bob'}) diff --git a/awx_collection/test/awx/test_workflow_job_template.py b/awx_collection/test/awx/test_workflow_job_template.py index c15325cfa9..c5448b23aa 100644 --- a/awx_collection/test/awx/test_workflow_job_template.py +++ b/awx_collection/test/awx/test_workflow_job_template.py @@ -71,7 +71,7 @@ def test_survey_spec_only_changed(run_module, admin_user, organization, survey_s @pytest.mark.django_db -def test_survey_spec_only_changed(run_module, admin_user, organization, survey_spec): +def test_survey_spec_missing_field(run_module, admin_user, organization, survey_spec): wfjt = WorkflowJobTemplate.objects.create(organization=organization, name='foo-workflow', survey_enabled=True, survey_spec=survey_spec) result = run_module('workflow_job_template', {'name': 'foo-workflow', 'organization': organization.name, 'state': 'present'}, admin_user) assert not result.get('failed', False), result.get('msg', result) From 72cd73ca71fc90023b30bc6b32cad6f2c5744dc3 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Fri, 14 Jan 2022 13:42:24 -0500 Subject: [PATCH 3/3] Update to cover stuff from tasks.py changes --- awx/main/tasks/jobs.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py index deff0c0cfc..c1a5baf363 100644 --- a/awx/main/tasks/jobs.py +++ b/awx/main/tasks/jobs.py @@ -1,5 +1,4 @@ # Python -from asyncio.log import logger from collections import deque, OrderedDict from distutils.dir_util import copy_tree import errno @@ -39,7 +38,6 @@ from awx.main.constants import ACTIVE_STATES from awx.main.dispatch.publish import task from awx.main.dispatch import get_local_queuename from awx.main.constants import PRIVILEGE_ESCALATION_METHODS, STANDARD_INVENTORY_UPDATE_ENV, MINIMAL_EVENTS, JOB_FOLDER_PREFIX -from awx.main.utils.safe_yaml import safe_dump from awx.main.redact import UriCleaner from awx.main.models import ( Instance,