diff --git a/awx/main/utils/pglock.py b/awx/main/utils/pglock.py index 3d8a00d20..0df334502 100644 --- a/awx/main/utils/pglock.py +++ b/awx/main/utils/pglock.py @@ -3,14 +3,14 @@ from contextlib import contextmanager -from django_pglocks import advisory_lock as django_pglocks_advisory_lock +from django_pg_utils.locks import advisory_lock as pgware_advisory_lock from django.db import connection @contextmanager def advisory_lock(*args, **kwargs): if connection.vendor == 'postgresql': - with django_pglocks_advisory_lock(*args, **kwargs) as internal_lock: + with pgware_advisory_lock(*args, **kwargs) as internal_lock: yield internal_lock else: yield True diff --git a/licenses/django-pglocks.txt b/licenses/django-pglocks.txt deleted file mode 100644 index 3b7473088..000000000 --- a/licenses/django-pglocks.txt +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (c) 2013 Christophe Pettus - -Licensed under the MIT License. diff --git a/licenses/django-pgware.txt b/licenses/django-pgware.txt new file mode 100644 index 000000000..4c95e2f1e --- /dev/null +++ b/licenses/django-pgware.txt @@ -0,0 +1,20 @@ +PostgreSQL License + +Copyright (c) 2013-2026, Christophe Pettus + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this paragraph +and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR DIRECT, +INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST +PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, +EVEN IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT +NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, +AND THE COPYRIGHT HOLDER HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, +UPDATES, ENHANCEMENTS, OR MODIFICATIONS. diff --git a/requirements/requirements.in b/requirements/requirements.in index d59089acd..06b745a74 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -23,7 +23,7 @@ django-extensions==4.1 django-guid==3.6.1 django-oauth-toolkit>=3.3.0 django-polymorphic -django-pglocks +django-pgware django-radius django-solo drf-spectacular>=0.27.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7108c3e92..d8da40747 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -108,6 +108,7 @@ django==5.2.17 # django-extensions # django-guid # django-oauth-toolkit + # django-pgware # django-polymorphic # django-solo # django-valkey @@ -126,7 +127,7 @@ django-guid==3.6.1 # via -r /awx_devel/requirements/requirements.in django-oauth-toolkit==3.3.0 # via -r /awx_devel/requirements/requirements.in -django-pglocks==1.0.4 +django-pgware==1.0.0 # via -r /awx_devel/requirements/requirements.in django-polymorphic==4.11.7 # via -r /awx_devel/requirements/requirements.in @@ -394,7 +395,6 @@ setuptools-scm[toml]==8.0.4 # via -r /awx_devel/requirements/requirements.in six==1.16.0 # via - # django-pglocks # isodate # kubernetes # openshift