From 88092322d8e9bd5323f3252afede85ed6aa37575 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 6 Mar 2018 20:51:28 +0100
Subject: [PATCH] Fix #110: completely removed django cachalot

---
 .env.dev                      | 1 -
 api/config/settings/common.py | 4 ----
 api/requirements/base.txt     | 3 ---
 changes/changelog.d/110.misc  | 1 +
 deploy/env.prod.sample        | 3 ---
 5 files changed, 1 insertion(+), 11 deletions(-)
 create mode 100644 changes/changelog.d/110.misc

diff --git a/.env.dev b/.env.dev
index d42cdad02..9923c3148 100644
--- a/.env.dev
+++ b/.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
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index d27857b07..1def68824 100644
--- a/api/config/settings/common.py
+++ b/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
diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index d402d3591..d6800f3b5 100644
--- a/api/requirements/base.txt
+++ b/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
diff --git a/changes/changelog.d/110.misc b/changes/changelog.d/110.misc
new file mode 100644
index 000000000..3b5163e92
--- /dev/null
+++ b/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
diff --git a/deploy/env.prod.sample b/deploy/env.prod.sample
index a8b4f7769..e1a381b94 100644
--- a/deploy/env.prod.sample
+++ b/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