Skip to content

Commit 9cd7fdb

Browse files
authored
Remove cacheops (#12087)
Looks like we never ended up using this dependency. Ref #10075.
1 parent 0b86a4c commit 9cd7fdb

File tree

8 files changed

+0
-57
lines changed

8 files changed

+0
-57
lines changed

dockerfiles/settings/proxito.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
class ProxitoDevSettings(CommunityProxitoSettingsMixin, DockerBaseSettings):
77
DONT_HIT_DB = False
88

9-
# Disabled because of issues like
10-
# ResponseError: Error running script (call to f_1880dea5c524f6a37a650f715fa630416a2fe1fd):
11-
# @user_script:50: @user_script: 50: Wrong number of args calling Redis command From Lua script
12-
# (this issue goes away after a few reloads)
13-
CACHEOPS_ENABLED = False
14-
159
# El Proxito does not have django-debug-toolbar installed
1610
@property
1711
def DEBUG_TOOLBAR_CONFIG(self):

readthedocs/settings/base.py

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ def INSTALLED_APPS(self): # noqa
306306
# but we still need to include it even when not enabled, since it has objects
307307
# related to the user model that Django needs to know about when deleting users.
308308
"impersonate",
309-
"cacheops",
310309
]
311310
if ext:
312311
apps.append("readthedocsext.cdn")
@@ -1045,43 +1044,4 @@ def SOCIALACCOUNT_PROVIDERS(self):
10451044
RTD_SPAM_THRESHOLD_DELETE_PROJECT = 1000
10461045
RTD_SPAM_MAX_SCORE = 9999
10471046

1048-
CACHEOPS_ENABLED = False
1049-
CACHEOPS_TIMEOUT = 60 * 60 # seconds
1050-
CACHEOPS_OPS = {"get", "fetch"}
1051-
CACHEOPS_DEGRADE_ON_FAILURE = True
1052-
CACHEOPS = {
1053-
# readthedocs.projects.*
1054-
"projects.project": {
1055-
"ops": CACHEOPS_OPS,
1056-
"timeout": CACHEOPS_TIMEOUT,
1057-
},
1058-
"projects.feature": {
1059-
"ops": CACHEOPS_OPS,
1060-
"timeout": CACHEOPS_TIMEOUT,
1061-
},
1062-
"projects.projectrelationship": {
1063-
"ops": CACHEOPS_OPS,
1064-
"timeout": CACHEOPS_TIMEOUT,
1065-
},
1066-
"projects.domain": {
1067-
"ops": CACHEOPS_OPS,
1068-
"timeout": CACHEOPS_TIMEOUT,
1069-
},
1070-
# readthedocs.builds.*
1071-
"builds.version": {
1072-
"ops": CACHEOPS_OPS,
1073-
"timeout": CACHEOPS_TIMEOUT,
1074-
},
1075-
# readthedocs.organizations.*
1076-
"organizations.organization": {
1077-
"ops": CACHEOPS_OPS,
1078-
"timeout": CACHEOPS_TIMEOUT,
1079-
},
1080-
# readthedocs.subscriptions.*
1081-
"subscriptions.planfeature": {
1082-
"ops": CACHEOPS_OPS,
1083-
"timeout": CACHEOPS_TIMEOUT,
1084-
},
1085-
}
1086-
10871047
S3_PROVIDER = "AWS"

readthedocs/settings/docker_compose.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ def DATABASES(self): # noqa
169169
},
170170
}
171171

172-
CACHEOPS_REDIS = f"redis://:redispassword@cache:6379/1"
173172
BROKER_URL = f"redis://:redispassword@cache:6379/0"
174173

175174
CELERY_ALWAYS_EAGER = False

requirements/deploy.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ django-annoying==0.10.8
129129
# via -r requirements/pip.txt
130130
django-autoslug==1.9.9
131131
# via -r requirements/pip.txt
132-
django-cacheops==7.1
133-
# via -r requirements/pip.txt
134132
django-celery-beat==2.7.0
135133
# via -r requirements/pip.txt
136134
django-cors-headers==4.7.0

requirements/docker.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ django-annoying==0.10.8
139139
# via -r requirements/pip.txt
140140
django-autoslug==1.9.9
141141
# via -r requirements/pip.txt
142-
django-cacheops==7.1
143-
# via -r requirements/pip.txt
144142
django-celery-beat==2.7.0
145143
# via -r requirements/pip.txt
146144
django-cors-headers==4.7.0

requirements/pip.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ dparse
145145

146146
gunicorn
147147

148-
django-cacheops
149-
150148
# Used by Addons for sorting patterns
151149
bumpver
152150

requirements/pip.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ django-annoying==0.10.8
9393
# via -r requirements/pip.in
9494
django-autoslug==1.9.9
9595
# via -r requirements/pip.in
96-
django-cacheops==7.1
97-
# via -r requirements/pip.in
9896
django-celery-beat==2.7.0
9997
# via -r requirements/pip.in
10098
django-cors-headers==4.7.0

requirements/testing.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ django-annoying==0.10.8
134134
# via -r requirements/pip.txt
135135
django-autoslug==1.9.9
136136
# via -r requirements/pip.txt
137-
django-cacheops==7.1
138-
# via -r requirements/pip.txt
139137
django-celery-beat==2.7.0
140138
# via -r requirements/pip.txt
141139
django-cors-headers==4.7.0

0 commit comments

Comments
 (0)