diff --git a/.travis.yml b/.travis.yml index e07f042c..f539f181 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - "3.5" services: - rabbitmq # will start rabbitmq-server + - redis-server cache: - apt - pip diff --git a/requirements.txt b/requirements.txt index 993c3787..ea719faa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ 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 diff --git a/settings/common.py b/settings/common.py index 3687486b..d1f5e6f5 100644 --- a/settings/common.py +++ b/settings/common.py @@ -35,6 +35,7 @@ DATABASES = { } } +# Default cache (you can use redis cache, see settings/locale.py.example) CACHES = { "default": { "BACKEND": "django.core.cache.backends.locmem.LocMemCache", @@ -42,6 +43,7 @@ CACHES = { } } + PASSWORD_HASHERS = [ "django.contrib.auth.hashers.PBKDF2PasswordHasher", ] diff --git a/settings/local.py.example b/settings/local.py.example index 28f5abb9..ca4a9b42 100644 --- a/settings/local.py.example +++ b/settings/local.py.example @@ -33,6 +33,17 @@ 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", diff --git a/settings/testing.py b/settings/testing.py index b1549a8a..abb66205 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -17,6 +17,16 @@ 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 diff --git a/settings/travis.py b/settings/travis.py index 8481688c..f0a56652 100644 --- a/settings/travis.py +++ b/settings/travis.py @@ -24,3 +24,13 @@ DATABASES = { 'USERNAME': 'postgres', } } + +CACHES = { + "default": { + "BACKEND": "django_redis.cache.RedisCache", + "LOCATION": "'redis://localhost:6379/1", + "OPTIONS": { + "CLIENT_CLASS": "django_redis.client.DefaultClient", + } + } +}