diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index 15394a9cd3..d178208cab 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -375,7 +375,7 @@ def events_table(since, full_path, until, **kwargs): try: return _copy_table(table='events', query=query("main_jobevent.event_data::json"), path=full_path) - except UntranslatableCharacter as exc: + except UntranslatableCharacter: return _copy_table(table='events', query=query("replace(main_jobevent.event_data::text, '\\u0000', '')::json"), path=full_path) diff --git a/awx/main/analytics/metrics.py b/awx/main/analytics/metrics.py index 81c6ab96ad..9ddb97e13b 100644 --- a/awx/main/analytics/metrics.py +++ b/awx/main/analytics/metrics.py @@ -1,5 +1,5 @@ from django.conf import settings -from prometheus_client import PROCESS_COLLECTOR, PLATFORM_COLLECTOR, GC_COLLECTOR, CollectorRegistry, Gauge, Info, generate_latest +from prometheus_client import CollectorRegistry, Gauge, Info, generate_latest from awx.conf.license import get_license from awx.main.utils import get_awx_version diff --git a/awx/main/migrations/0007_v320_data_migrations.py b/awx/main/migrations/0007_v320_data_migrations.py index d639c3efb6..d05e01c6f6 100644 --- a/awx/main/migrations/0007_v320_data_migrations.py +++ b/awx/main/migrations/0007_v320_data_migrations.py @@ -2,12 +2,8 @@ # Python from __future__ import unicode_literals -# Django -from django.db import migrations, models - # AWX from awx.main.migrations import ActivityStreamDisabledMigration -import awx.main.fields class Migration(ActivityStreamDisabledMigration): diff --git a/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py b/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py index a8504fbad0..5d5fea624e 100644 --- a/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py +++ b/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -# AWX -from awx.main.migrations import _migration_utils as migration_utils -from awx.main.migrations import _credentialtypes as credentialtypes - from django.db import migrations, models diff --git a/awx/main/migrations/0011_v322_encrypt_survey_passwords.py b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py index 9fe757a9f5..70bab5a720 100644 --- a/awx/main/migrations/0011_v322_encrypt_survey_passwords.py +++ b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations from awx.main.migrations import ActivityStreamDisabledMigration diff --git a/awx/main/migrations/0015_v330_blank_start_args.py b/awx/main/migrations/0015_v330_blank_start_args.py index 2dc57c1593..03cab1df41 100644 --- a/awx/main/migrations/0015_v330_blank_start_args.py +++ b/awx/main/migrations/0015_v330_blank_start_args.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals # Django -from django.db import migrations, models +from django.db import migrations # AWX from awx.main.migrations import _migration_utils as migration_utils diff --git a/awx/main/migrations/0016_v330_non_blank_workflow.py b/awx/main/migrations/0016_v330_non_blank_workflow.py index f715f0635c..4e581e0af3 100644 --- a/awx/main/migrations/0016_v330_non_blank_workflow.py +++ b/awx/main/migrations/0016_v330_non_blank_workflow.py @@ -2,7 +2,6 @@ # Generated by Django 1.11.7 on 2017-12-11 16:40 from __future__ import unicode_literals -from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/awx/main/migrations/0021_v330_declare_new_rbac_roles.py b/awx/main/migrations/0021_v330_declare_new_rbac_roles.py index c1c1521efc..e847a62c14 100644 --- a/awx/main/migrations/0021_v330_declare_new_rbac_roles.py +++ b/awx/main/migrations/0021_v330_declare_new_rbac_roles.py @@ -3,8 +3,7 @@ from __future__ import unicode_literals import awx.main.fields -from django.conf import settings -from django.db import migrations, models +from django.db import migrations import django.db.models.deletion diff --git a/awx/main/migrations/0026_v330_delete_authtoken.py b/awx/main/migrations/0026_v330_delete_authtoken.py index d20d3d54e4..758a3efdb0 100644 --- a/awx/main/migrations/0026_v330_delete_authtoken.py +++ b/awx/main/migrations/0026_v330_delete_authtoken.py @@ -2,10 +2,7 @@ # Generated by Django 1.11.7 on 2018-02-27 17:58 from __future__ import unicode_literals -import awx.main.fields -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion +from django.db import migrations # TODO: Squash all of these migrations with '0024_v330_add_oauth_activity_stream_registrar' diff --git a/awx/main/migrations/0028_v330_add_tower_verify.py b/awx/main/migrations/0028_v330_add_tower_verify.py index 5fd671cde5..e995afc3de 100644 --- a/awx/main/migrations/0028_v330_add_tower_verify.py +++ b/awx/main/migrations/0028_v330_add_tower_verify.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals # AWX from awx.main.migrations import _credentialtypes as credentialtypes -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): diff --git a/awx/main/migrations/0030_v330_modify_application.py b/awx/main/migrations/0030_v330_modify_application.py index dcdfe074e0..02f47c3957 100644 --- a/awx/main/migrations/0030_v330_modify_application.py +++ b/awx/main/migrations/0030_v330_modify_application.py @@ -2,8 +2,6 @@ # Generated by Django 1.11.11 on 2018-03-16 20:25 from __future__ import unicode_literals -import awx.main.fields -from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/awx/main/migrations/0038_v330_add_deleted_activitystream_actor.py b/awx/main/migrations/0038_v330_add_deleted_activitystream_actor.py index 71a9a92df7..2f856e23f5 100644 --- a/awx/main/migrations/0038_v330_add_deleted_activitystream_actor.py +++ b/awx/main/migrations/0038_v330_add_deleted_activitystream_actor.py @@ -4,9 +4,7 @@ from __future__ import unicode_literals import awx.main.fields import awx.main.models.activity_stream -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion +from django.db import migrations class Migration(migrations.Migration): diff --git a/awx/main/migrations/0039_v330_custom_venv_help_text.py b/awx/main/migrations/0039_v330_custom_venv_help_text.py index 86101eb570..7c4ee1042c 100644 --- a/awx/main/migrations/0039_v330_custom_venv_help_text.py +++ b/awx/main/migrations/0039_v330_custom_venv_help_text.py @@ -2,10 +2,7 @@ # Generated by Django 1.11.11 on 2018-05-23 20:17 from __future__ import unicode_literals -import awx.main.fields -from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/awx/main/migrations/0069_v350_generate_unique_install_uuid.py b/awx/main/migrations/0069_v350_generate_unique_install_uuid.py index 179e4a764d..be64b69fb7 100644 --- a/awx/main/migrations/0069_v350_generate_unique_install_uuid.py +++ b/awx/main/migrations/0069_v350_generate_unique_install_uuid.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from uuid import uuid4 -from django.db import migrations, models +from django.db import migrations from django.utils.timezone import now diff --git a/awx/main/migrations/0076_v360_add_new_instance_group_relations.py b/awx/main/migrations/0076_v360_add_new_instance_group_relations.py index c1dc29f79c..1c7545b1c8 100644 --- a/awx/main/migrations/0076_v360_add_new_instance_group_relations.py +++ b/awx/main/migrations/0076_v360_add_new_instance_group_relations.py @@ -2,7 +2,7 @@ # Generated by Django 1.11.20 on 2019-05-06 15:20 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations from awx.main.fields import OrderedManyToManyField diff --git a/awx/main/migrations/0084_v360_token_description.py b/awx/main/migrations/0084_v360_token_description.py index 07064ca03f..b360b3e0f8 100644 --- a/awx/main/migrations/0084_v360_token_description.py +++ b/awx/main/migrations/0084_v360_token_description.py @@ -2,8 +2,6 @@ from django.db import migrations, models -import awx - class Migration(migrations.Migration): diff --git a/awx/main/migrations/0109_v370_job_template_organization_field.py b/awx/main/migrations/0109_v370_job_template_organization_field.py index 46544b8b3c..37f8bf97c0 100644 --- a/awx/main/migrations/0109_v370_job_template_organization_field.py +++ b/awx/main/migrations/0109_v370_job_template_organization_field.py @@ -7,7 +7,6 @@ import django.db.models.deletion from awx.main.migrations._rbac import ( rebuild_role_parentage, - rebuild_role_hierarchy, migrate_ujt_organization, migrate_ujt_organization_backward, restore_inventory_admins, diff --git a/awx/main/migrations/0120_galaxy_credentials.py b/awx/main/migrations/0120_galaxy_credentials.py index effff89a14..fdd6c84d51 100644 --- a/awx/main/migrations/0120_galaxy_credentials.py +++ b/awx/main/migrations/0120_galaxy_credentials.py @@ -3,15 +3,11 @@ import logging import awx.main.fields -from awx.main.utils.encryption import encrypt_field, decrypt_field from django.db import migrations, models -from django.utils.timezone import now import django.db.models.deletion from awx.main.migrations import _galaxy as galaxy -from awx.main.models import CredentialType as ModernCredentialType -from awx.main.utils.common import set_current_apps logger = logging.getLogger('awx.main.migrations') diff --git a/awx/main/migrations/_create_system_jobs.py b/awx/main/migrations/_create_system_jobs.py index 78f7dd689d..f0f8648c4b 100644 --- a/awx/main/migrations/_create_system_jobs.py +++ b/awx/main/migrations/_create_system_jobs.py @@ -1,8 +1,6 @@ -import random import logging -from django.db import migrations, models -from django.utils.timezone import now, timedelta +from django.utils.timezone import now logger = logging.getLogger('awx.main.migrations') diff --git a/awx/main/migrations/_inventory_source.py b/awx/main/migrations/_inventory_source.py index a3560a537f..40769a0cf9 100644 --- a/awx/main/migrations/_inventory_source.py +++ b/awx/main/migrations/_inventory_source.py @@ -1,9 +1,6 @@ import logging -from uuid import uuid4 - from django.utils.encoding import smart_text -from django.utils.timezone import now from awx.main.utils.common import set_current_apps from awx.main.utils.common import parse_yaml_or_json diff --git a/awx/main/scheduler/kubernetes.py b/awx/main/scheduler/kubernetes.py index 665af07273..cb17d0231e 100644 --- a/awx/main/scheduler/kubernetes.py +++ b/awx/main/scheduler/kubernetes.py @@ -1,5 +1,4 @@ import collections -import time import logging from base64 import b64encode diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 912bdb5364..3a8cf08c64 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -7,7 +7,6 @@ import yaml import logging import os import re -import subprocess import stat import urllib.parse import threading diff --git a/awx/ui/fields.py b/awx/ui/fields.py index 6893ed2068..04c6fba972 100644 --- a/awx/ui/fields.py +++ b/awx/ui/fields.py @@ -10,7 +10,7 @@ import re from django.utils.translation import ugettext_lazy as _ # Tower -from awx.conf import fields, register +from awx.conf import fields class PendoTrackingStateField(fields.ChoiceField): diff --git a/tox.ini b/tox.ini index 8f82e0bfc4..9ce52c4820 100644 --- a/tox.ini +++ b/tox.ini @@ -2,10 +2,12 @@ deps = make black + flake8 yamllint allowlist_externals = make setenv = BLACK_ARGS = --check commands = make black + flake8 awx --select=F401,F402,F821,F823,F841 yamllint -s .