MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #110: completely removed django cachalot

This commit is contained in:
Eliot Berriot 2018-03-06 20:51:28 +01:00
parent 55a93c71e3
commit 88092322d8
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
5 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.dev
View File

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

4
api/config/settings/common.py
View File

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

3
api/requirements/base.txt
View File

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

1
changes/changelog.d/110.misc Normal file
View File

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

3
deploy/env.prod.sample
View File

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