diff --git a/.travis.yml b/.travis.yml index f539f181..e07f042c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - "3.5" services: - rabbitmq # will start rabbitmq-server - - redis-server cache: - apt - pip diff --git a/requirements.txt b/requirements.txt index ea719faa..993c3787 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/settings/common.py b/settings/common.py index d1f5e6f5..3687486b 100644 --- a/settings/common.py +++ b/settings/common.py @@ -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", ] diff --git a/settings/local.py.example b/settings/local.py.example index ca4a9b42..28f5abb9 100644 --- a/settings/local.py.example +++ b/settings/local.py.example @@ -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", diff --git a/settings/testing.py b/settings/testing.py index abb66205..b1549a8a 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -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 diff --git a/settings/travis.py b/settings/travis.py index f0a56652..8481688c 100644 --- a/settings/travis.py +++ b/settings/travis.py @@ -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", - } - } -}