Merge branch '110-remove-cachalot' into 'develop'

Fix #110: completely removed django cachalot

Closes #110

See merge request funkwhale/funkwhale!82

.env.dev

@@ -1,4 +1,3 @@
 API_AUTHENTICATION_REQUIRED=True
-CACHALOT_ENABLED=False
 RAVEN_ENABLED=false
 RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f716@sentry.eliotberriot.com/5

api/config/settings/common.py

@@ -55,7 +55,6 @@ THIRD_PARTY_APPS = (
     'rest_framework',
     'rest_framework.authtoken',
     'taggit',
-    'cachalot',
     'rest_auth',
     'rest_auth.registration',
     'mptt',
@@ -371,9 +370,6 @@ MUSICBRAINZ_CACHE_DURATION = env.int(
     default=300
 )
 
-CACHALOT_ENABLED = env.bool('CACHALOT_ENABLED', default=True)
-
-
 # Custom Admin URL, use {% url 'admin:index' %}
 ADMIN_URL = env('DJANGO_ADMIN_URL', default='^api/admin/')
 CSRF_USE_SESSIONS = True

api/requirements/base.txt

@@ -50,9 +50,6 @@ mutagen>=1.39,<1.40
 django-taggit>=0.22,<0.23
 # Until this is merged
 git+https://github.com/EliotBerriot/PyMemoize.git@django
-# Until this is merged
-#django-cachalot==1.5.0
-git+https://github.com/EliotBerriot/django-cachalot.git@django-2
 
 django-dynamic-preferences>=1.5,<1.6
 pyacoustid>=1.1.5,<1.2

changes/changelog.d/110.misc

@@ -0,0 +1 @@
+Completely removed django-cachalot from the codebase (#110). You can safely remove the CACHALOT_ENABLED setting from your .env file

deploy/env.prod.sample

@@ -84,6 +84,3 @@ API_AUTHENTICATION_REQUIRED=True
 # This will help us detect and correct bugs
 RAVEN_ENABLED=false
 RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f716@sentry.eliotberriot.com/5
-
-# This setting will soon become useless
-CACHALOT_ENABLED=False