Revert "[Backport] Add django-redis"
This reverts commit d656458372
.
remotes/origin/issue/4795/notification_even_they_are_disabled
parent
d656458372
commit
b68935fa1d
|
@ -4,7 +4,6 @@ python:
|
|||
- "3.5"
|
||||
services:
|
||||
- rabbitmq # will start rabbitmq-server
|
||||
- redis-server
|
||||
cache:
|
||||
- apt
|
||||
- pip
|
||||
|
|
|
@ -11,7 +11,6 @@ amqp==1.4.7
|
|||
djmail==0.11
|
||||
django-pgjson==0.3.1
|
||||
djorm-pgarray==1.2
|
||||
django-redis==4.3.0
|
||||
django-jinja==2.1.1
|
||||
jinja2==2.8
|
||||
pygments==2.0.2
|
||||
|
|
|
@ -35,7 +35,6 @@ DATABASES = {
|
|||
}
|
||||
}
|
||||
|
||||
# Default cache (you can use redis cache, see settings/locale.py.example)
|
||||
CACHES = {
|
||||
"default": {
|
||||
"BACKEND": "django.core.cache.backends.locmem.LocMemCache",
|
||||
|
@ -43,7 +42,6 @@ CACHES = {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
PASSWORD_HASHERS = [
|
||||
"django.contrib.auth.hashers.PBKDF2PasswordHasher",
|
||||
]
|
||||
|
|
|
@ -33,17 +33,6 @@ DATABASES = {
|
|||
}
|
||||
}
|
||||
|
||||
# You can use redis cache
|
||||
#CACHES = {
|
||||
# "default": {
|
||||
# "BACKEND": "django_redis.cache.RedisCache",
|
||||
# "LOCATION": "'redis://localhost:6379/1",
|
||||
# "OPTIONS": {
|
||||
# "CLIENT_CLASS": "django_redis.client.DefaultClient",
|
||||
# }
|
||||
# }
|
||||
#}
|
||||
|
||||
#SITES = {
|
||||
# "api": {
|
||||
# "scheme": "http",
|
||||
|
|
|
@ -17,16 +17,6 @@
|
|||
|
||||
from .development import *
|
||||
|
||||
CACHES = {
|
||||
"default": {
|
||||
"BACKEND": "django_redis.cache.RedisCache",
|
||||
"LOCATION": "'redis://localhost:6379/1",
|
||||
"OPTIONS": {
|
||||
"CLIENT_CLASS": "django_redis.client.DefaultClient",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SKIP_SOUTH_TESTS = True
|
||||
SOUTH_TESTS_MIGRATE = False
|
||||
CELERY_ALWAYS_EAGER = True
|
||||
|
|
|
@ -24,13 +24,3 @@ DATABASES = {
|
|||
'USERNAME': 'postgres',
|
||||
}
|
||||
}
|
||||
|
||||
CACHES = {
|
||||
"default": {
|
||||
"BACKEND": "django_redis.cache.RedisCache",
|
||||
"LOCATION": "'redis://localhost:6379/1",
|
||||
"OPTIONS": {
|
||||
"CLIENT_CLASS": "django_redis.client.DefaultClient",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue