diff --git a/awx/main/expect/isolated_manager.py b/awx/main/expect/isolated_manager.py index e75cd2cf79..ba1256062d 100644 --- a/awx/main/expect/isolated_manager.py +++ b/awx/main/expect/isolated_manager.py @@ -1,5 +1,3 @@ -import base64 -import codecs import json import os import shutil @@ -11,11 +9,10 @@ import logging from io import StringIO from django.conf import settings -from django.utils.encoding import smart_bytes, smart_str import awx from awx.main.expect import run -from awx.main.utils import OutputEventFilter, get_system_task_capacity +from awx.main.utils import get_system_task_capacity from awx.main.queue import CallbackQueueDispatcher logger = logging.getLogger('awx.isolated.manager') diff --git a/awx/main/tests/unit/expect/test_expect.py b/awx/main/tests/unit/expect/test_expect.py index 32a6e6fa37..d167c0733d 100644 --- a/awx/main/tests/unit/expect/test_expect.py +++ b/awx/main/tests/unit/expect/test_expect.py @@ -2,12 +2,10 @@ import os import pytest -import re import shutil import stat import tempfile import time -from collections import OrderedDict from io import StringIO from unittest import mock diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py index 09ec14d0b0..6148e06e0c 100644 --- a/awx/main/tests/unit/models/test_survey_models.py +++ b/awx/main/tests/unit/models/test_survey_models.py @@ -1,12 +1,9 @@ # -*- coding: utf-8 -*- -import tempfile import json -import yaml import pytest from itertools import count from awx.main.utils.encryption import encrypt_value -from awx.main.tasks import RunJob from awx.main.models import ( Job, JobTemplate, @@ -15,7 +12,6 @@ from awx.main.models import ( Project, Inventory ) -from awx.main.utils.safe_yaml import SafeLoader ENCRYPTED_SECRET = encrypt_value('secret') diff --git a/setup.py b/setup.py index ae73ef6a42..294190104b 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,6 @@ import os import glob import sys from setuptools import setup -from distutils.command.sdist import sdist # Paths we'll use later