From e029cf7196c174ef22aa060d7c1dd3ae06de971c Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 10 Nov 2022 15:22:06 -0500 Subject: [PATCH] Remove the django-qsstats-magic dependency --- awx/main/dispatch/pool.py | 2 +- docs/licenses/django-qsstats-magic.txt | 24 ------------------------ requirements/requirements.in | 1 - requirements/requirements.txt | 3 --- 4 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 docs/licenses/django-qsstats-magic.txt diff --git a/awx/main/dispatch/pool.py b/awx/main/dispatch/pool.py index 841b587d8e..3310f06997 100644 --- a/awx/main/dispatch/pool.py +++ b/awx/main/dispatch/pool.py @@ -466,7 +466,7 @@ class AutoscalePool(WorkerPool): task_name = 'unknown' if isinstance(body, dict): task_name = body.get('task') - logger.warn(f'Workers maxed, queuing {task_name}, load: {sum(len(w.managed_tasks) for w in self.workers)} / {len(self.workers)}') + logger.warning(f'Workers maxed, queuing {task_name}, load: {sum(len(w.managed_tasks) for w in self.workers)} / {len(self.workers)}') return super(AutoscalePool, self).write(preferred_queue, body) except Exception: for conn in connections.all(): diff --git a/docs/licenses/django-qsstats-magic.txt b/docs/licenses/django-qsstats-magic.txt deleted file mode 100644 index adef47b952..0000000000 --- a/docs/licenses/django-qsstats-magic.txt +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2010, Matt Croydon, Mikhail Korobov -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the tastypie nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL MATT CROYDON BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/requirements/requirements.in b/requirements/requirements.in index 00779e760c..3a125fec79 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -19,7 +19,6 @@ django-guid==3.2.1 django-oauth-toolkit==1.4.1 django-polymorphic django-pglocks -django-qsstats-magic django-redis django-solo django-split-settings diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c407a3f5ee..3a50cd03a0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -115,9 +115,6 @@ django-pglocks==1.0.4 # via -r /awx_devel/requirements/requirements.in django-polymorphic==3.1.0 # via -r /awx_devel/requirements/requirements.in -django-qsstats-magic==1.1.0 - # via -r /awx_devel/requirements/requirements.in - # via -r /awx_devel/requirements/requirements_git.txt django-redis==4.5.0 # via -r /awx_devel/requirements/requirements.in django-solo==2.0.0