yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 05:49:16 +02:00
Code Issues Releases Wiki Activity

See #297: linting of various, uncommon errors

Browse source
This commit is contained in:
Eliot Berriot 2018-06-10 12:06:46 +02:00
parent ab80dffeea
commit d17ceec1f0
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
29 changed files with 39 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/config/settings/common.py
View file

@ -11,7 +11,6 @@ https://docs.djangoproject.com/en/dev/ref/settings/
from __future__ import absolute_import, unicode_literals
import datetime
import os
from urllib.parse import urlparse, urlsplit
import environ
@ -23,7 +22,6 @@ ROOT_DIR = environ.Path(__file__) - 3 # (/a/b/myfile.py - 3 = /)
APPS_DIR = ROOT_DIR.path("funkwhale_api")
env = environ.Env()
try:
env.read_env(ROOT_DIR.file(".env"))
except FileNotFoundError:
@ -333,12 +331,12 @@ CACHES["default"]["OPTIONS"] = {
}
########## CELERY
# CELERY
INSTALLED_APPS += ("funkwhale_api.taskapp.celery.CeleryConfig",)
CELERY_BROKER_URL = env(
"CELERY_BROKER_URL", default=env("CACHE_URL", default=CACHE_DEFAULT)
)
########## END CELERY
# END CELERY
# Location of root django.contrib.admin URL, use {% url 'admin:index' %}
# Your common stuff: Below this line define 3rd party library settings