From 3b896a00a95d955afafd4d059e5f817b9bdf4af1 Mon Sep 17 00:00:00 2001 From: thedoubl3j Date: Tue, 13 Jan 2026 15:41:06 -0500 Subject: [PATCH] Clean up imports and fix some tests * removed unused imports * adjusted test import to pull correct method --- awx/main/dispatch/pool.py | 16 +--------------- awx/main/dispatch/worker/base.py | 2 -- awx/main/management/commands/run_dispatcher.py | 6 ------ awx/main/models/unified_jobs.py | 1 - awx/main/tasks/system.py | 2 -- awx/main/tests/functional/models/test_ha.py | 2 +- 6 files changed, 2 insertions(+), 27 deletions(-) diff --git a/awx/main/dispatch/pool.py b/awx/main/dispatch/pool.py index e660751e16..d873bef5bf 100644 --- a/awx/main/dispatch/pool.py +++ b/awx/main/dispatch/pool.py @@ -1,31 +1,17 @@ import logging import os -import sys import time -import traceback -from datetime import datetime, timezone -from uuid import uuid4 -import collections from multiprocessing import Process from multiprocessing import Queue as MPQueue -from queue import Full as QueueFull, Empty as QueueEmpty from django.conf import settings -from django.db import connection as django_connection, connections +from django.db import connection as django_connection from django.core.cache import cache as django_cache -from jinja2 import Template -import psutil - logger = logging.getLogger('awx.main.commands.run_callback_receiver') -class NoOpResultQueue(object): - def put(self, item): - pass - - class PoolWorker(object): """ Used to track a worker child process and its pending and finished messages. diff --git a/awx/main/dispatch/worker/base.py b/awx/main/dispatch/worker/base.py index f3f9f14cf0..477e5b5d3f 100644 --- a/awx/main/dispatch/worker/base.py +++ b/awx/main/dispatch/worker/base.py @@ -10,8 +10,6 @@ import time from queue import Empty as QueueEmpty from django import db -from django.conf import settings -import redis.exceptions from awx.main.utils.redis import get_redis_client diff --git a/awx/main/management/commands/run_dispatcher.py b/awx/main/management/commands/run_dispatcher.py index 63b42c6d64..dc7dcd4c8d 100644 --- a/awx/main/management/commands/run_dispatcher.py +++ b/awx/main/management/commands/run_dispatcher.py @@ -3,14 +3,8 @@ import logging import logging.config import yaml -import copy -import redis - -from django.conf import settings -from django.db import connection from django.core.management.base import BaseCommand, CommandError -from django.core.cache import cache as django_cache from dispatcherd.factories import get_control_from_settings from dispatcherd import run_service diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index d9a0dd6c2f..350abd908d 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -27,7 +27,6 @@ from django.utils.translation import gettext_lazy as _ from django.utils.timezone import now from django.utils.encoding import smart_str from django.contrib.contenttypes.models import ContentType -from flags.state import flag_enabled # REST Framework from rest_framework.exceptions import ParseError diff --git a/awx/main/tasks/system.py b/awx/main/tasks/system.py index 6c89f57258..b3fe21d103 100644 --- a/awx/main/tasks/system.py +++ b/awx/main/tasks/system.py @@ -9,7 +9,6 @@ import shutil import time from collections import namedtuple from contextlib import redirect_stdout -from datetime import datetime from packaging.version import Version from io import StringIO @@ -76,7 +75,6 @@ from awx.main.tasks.host_indirect import save_indirect_host_entries from awx.main.tasks.receptor import administrative_workunit_reaper, get_receptor_ctl, worker_cleanup, worker_info, write_receptor_config from awx.main.utils.common import ignore_inventory_computed_fields, ignore_inventory_group_removal from awx.main.utils.reload import stop_local_services -from dispatcherd.publish import task logger = logging.getLogger('awx.main.tasks.system') diff --git a/awx/main/tests/functional/models/test_ha.py b/awx/main/tests/functional/models/test_ha.py index bf8c5309c7..c8ee9dc0a7 100644 --- a/awx/main/tests/functional/models/test_ha.py +++ b/awx/main/tests/functional/models/test_ha.py @@ -3,7 +3,7 @@ import pytest # AWX from awx.main.ha import is_ha_environment from awx.main.models.ha import Instance -from awx.main.dispatch.pool import get_auto_max_workers +from awx.main.utils.common import get_auto_max_workers # Django from django.test.utils import override_settings