summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2023-07-13 19:16:16 +0200
committerGitHub <noreply@github.com>2023-07-13 19:16:16 +0200
commit8cfb704f86af3f95fcd3926ffe1729cf51aef4b8 (patch)
treeec4224aed2af15fda94910bb87ada4711ec6cbde
parentUpgrade django to 4.2.3 (#14228) (diff)
downloadawx-8cfb704f86af3f95fcd3926ffe1729cf51aef4b8.tar.xz
awx-8cfb704f86af3f95fcd3926ffe1729cf51aef4b8.zip
Migrate from django-redis to Django's built-in Redis caching support (#14210)
Signed-off-by: Rick Elrod <rick@elrod.me>
-rw-r--r--awx/settings/defaults.py2
-rw-r--r--licenses/django-redis.txt26
-rw-r--r--requirements/requirements.in1
-rw-r--r--requirements/requirements.txt7
4 files changed, 2 insertions, 34 deletions
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 714aa6ea6f..788b69558a 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -477,7 +477,7 @@ CELERYBEAT_SCHEDULE = {
# Django Caching Configuration
DJANGO_REDIS_IGNORE_EXCEPTIONS = True
-CACHES = {'default': {'BACKEND': 'django_redis.cache.RedisCache', 'LOCATION': 'unix:/var/run/redis/redis.sock?db=1'}}
+CACHES = {'default': {'BACKEND': 'django.core.cache.backends.redis.RedisCache', 'LOCATION': 'unix:/var/run/redis/redis.sock?db=1'}}
# Social Auth configuration.
SOCIAL_AUTH_STRATEGY = 'social_django.strategy.DjangoStrategy'
diff --git a/licenses/django-redis.txt b/licenses/django-redis.txt
deleted file mode 100644
index 5e1ae723df..0000000000
--- a/licenses/django-redis.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2011-2016 Andrey Antukh <niwi@niwi.nz>
-Copyright (c) 2011 Sean Bleier
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. 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.
-3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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. \ No newline at end of file
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 2e049e7992..888f9c8a91 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -21,7 +21,6 @@ django-guid==3.2.1
django-oauth-toolkit<2.0.0 # Version 2.0.0 has breaking changes that will need to be worked out before upgrading
django-polymorphic
django-pglocks
-django-redis
django-solo
django-split-settings==1.0.0 # We hit a strange issue where the release process errored when upgrading past 1.0.0 see UPGRADE BLOCKERS
django-taggit
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index d0f649817a..f36696773a 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -116,7 +116,6 @@ django==4.2.3
# django-guid
# django-oauth-toolkit
# django-polymorphic
- # django-redis
# django-solo
# django-taggit
# djangorestframework
@@ -137,8 +136,6 @@ django-pglocks==1.0.4
django-polymorphic==3.1.0
# via -r /awx_devel/requirements/requirements.in
# via -r /awx_devel/requirements/requirements_git.txt
-django-redis==5.2.0
- # via -r /awx_devel/requirements/requirements.in
django-solo==2.0.0
# via -r /awx_devel/requirements/requirements.in
django-split-settings==1.0.0
@@ -360,9 +357,7 @@ pyyaml==6.0
receptorctl==1.3.0
# via -r /awx_devel/requirements/requirements.in
redis==4.3.5
- # via
- # -r /awx_devel/requirements/requirements.in
- # django-redis
+ # via -r /awx_devel/requirements/requirements.in
requests==2.28.1
# via
# -r /awx_devel/requirements/requirements.in