Format all python files using the formatter
Run `git ls-files '*.py' | xargs black`
Issue: HIC-161
Change-Id: I1619e6296bc4036504c5bb73128f769a1b7b688d
diff --git a/hiccup/allauth_adapters.py b/hiccup/allauth_adapters.py
index 268d590..4eb3a06 100644
--- a/hiccup/allauth_adapters.py
+++ b/hiccup/allauth_adapters.py
@@ -3,27 +3,29 @@
from django.core.exceptions import PermissionDenied
from django.contrib.auth.models import Group
+
class FairphoneAccountAdapter(DefaultSocialAccountAdapter):
-
def is_open_for_signup(self, request, sociallogin):
return True
-
+
def save_user(self, request, sociallogin, form=None):
- u =DefaultSocialAccountAdapter.save_user(self, request, sociallogin, form=None)
- if u.email.split('@')[1] == "fairphone.com":
- g = Group.objects.get(name='FairphoneSoftwareTeam')
+ u = DefaultSocialAccountAdapter.save_user(
+ self, request, sociallogin, form=None
+ )
+ if u.email.split("@")[1] == "fairphone.com":
+ g = Group.objects.get(name="FairphoneSoftwareTeam")
g.user_set.add(u)
return u
-
- def populate_user(self,
- request,
- sociallogin,
- data):
- u = DefaultSocialAccountAdapter.populate_user(self,request,sociallogin,data)
- if not u.email.split('@')[1] == "fairphone.com":
- raise PermissionDenied()
+
+ def populate_user(self, request, sociallogin, data):
+ u = DefaultSocialAccountAdapter.populate_user(
+ self, request, sociallogin, data
+ )
+ if not u.email.split("@")[1] == "fairphone.com":
+ raise PermissionDenied()
return u
+
class FormAccountAdapter(DefaultAccountAdapter):
def is_open_for_signup(self, request):
return False
diff --git a/hiccup/apps.py b/hiccup/apps.py
index d651203..dacae51 100644
--- a/hiccup/apps.py
+++ b/hiccup/apps.py
@@ -4,4 +4,4 @@
class crashreportsConfig(AppConfig):
- name = 'crashreports'
+ name = "crashreports"
diff --git a/hiccup/settings.py b/hiccup/settings.py
index f20c3c8..a401d04 100644
--- a/hiccup/settings.py
+++ b/hiccup/settings.py
@@ -20,85 +20,84 @@
# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '7u+#ha3hk!x+*)clhs46%n*)w1q+5s4+yoc#1!nm0b%fwwrud@'
+SECRET_KEY = "7u+#ha3hk!x+*)clhs46%n*)w1q+5s4+yoc#1!nm0b%fwwrud@"
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = ["*"]
# Application definition
INSTALLED_APPS = [
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'rest_framework',
- 'rest_framework.authtoken',
- 'crashreports',
- 'crashreport_stats',
- 'taggit',
- 'crispy_forms',
- 'bootstrap3',
- 'bootstrapform',
- 'django_extensions',
- 'django_filters',
- 'djfrontend',
- 'djfrontend.skeleton',
- 'allauth',
- 'allauth.account',
- 'allauth.socialaccount',
- 'allauth.socialaccount.providers.google',
- 'drf_yasg'
+ "django.contrib.admin",
+ "django.contrib.auth",
+ "django.contrib.contenttypes",
+ "django.contrib.sessions",
+ "django.contrib.sites",
+ "django.contrib.messages",
+ "django.contrib.staticfiles",
+ "rest_framework",
+ "rest_framework.authtoken",
+ "crashreports",
+ "crashreport_stats",
+ "taggit",
+ "crispy_forms",
+ "bootstrap3",
+ "bootstrapform",
+ "django_extensions",
+ "django_filters",
+ "djfrontend",
+ "djfrontend.skeleton",
+ "allauth",
+ "allauth.account",
+ "allauth.socialaccount",
+ "allauth.socialaccount.providers.google",
+ "drf_yasg",
]
MIDDLEWARE_CLASSES = [
- 'django.middleware.security.SecurityMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ "django.middleware.security.SecurityMiddleware",
+ "django.contrib.sessions.middleware.SessionMiddleware",
+ "django.middleware.common.CommonMiddleware",
+ "django.middleware.csrf.CsrfViewMiddleware",
+ "django.contrib.auth.middleware.AuthenticationMiddleware",
+ "django.contrib.auth.middleware.SessionAuthenticationMiddleware",
+ "django.contrib.messages.middleware.MessageMiddleware",
+ "django.middleware.clickjacking.XFrameOptionsMiddleware",
]
-ROOT_URLCONF = 'hiccup.urls'
+ROOT_URLCONF = "hiccup.urls"
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
+ "django.template.loaders.filesystem.Loader",
+ "django.template.loaders.app_directories.Loader",
)
TEMPLATES = [
{
- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join(BASE_DIR, 'hiccup', 'templates')],
- 'APP_DIRS': True,
- 'OPTIONS': {
- 'context_processors': [
- 'django.template.context_processors.debug',
- 'django.template.context_processors.request',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
+ "BACKEND": "django.template.backends.django.DjangoTemplates",
+ "DIRS": [os.path.join(BASE_DIR, "hiccup", "templates")],
+ "APP_DIRS": True,
+ "OPTIONS": {
+ "context_processors": [
+ "django.template.context_processors.debug",
+ "django.template.context_processors.request",
+ "django.contrib.auth.context_processors.auth",
+ "django.contrib.messages.context_processors.messages",
# `allauth` needs this from django
- 'django.template.context_processors.request',
- ],
+ "django.template.context_processors.request",
+ ]
},
- },
+ }
]
AUTHENTICATION_BACKENDS = (
# Needed to login by username in Django admin, regardless of `allauth`
- 'django.contrib.auth.backends.ModelBackend',
-
+ "django.contrib.auth.backends.ModelBackend",
# `allauth` specific authentication methods, such as login by e-mail
- 'allauth.account.auth_backends.AuthenticationBackend',
+ "allauth.account.auth_backends.AuthenticationBackend",
)
# WSGI_APPLICATION = 'hiccup_server.wsgi.application'
@@ -108,9 +107,9 @@
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+ "default": {
+ "ENGINE": "django.db.backends.sqlite3",
+ "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
}
}
@@ -120,46 +119,46 @@
AUTH_PASSWORD_VALIDATORS = [
{
- 'NAME': 'django.contrib.auth.password_validation'
- '.UserAttributeSimilarityValidator',
+ "NAME": "django.contrib.auth.password_validation"
+ ".UserAttributeSimilarityValidator"
},
{
- 'NAME': 'django.contrib.auth.password_validation'
- '.MinimumLengthValidator',
+ "NAME": "django.contrib.auth.password_validation"
+ ".MinimumLengthValidator"
},
{
- 'NAME': 'django.contrib.auth.password_validation'
- '.CommonPasswordValidator',
+ "NAME": "django.contrib.auth.password_validation"
+ ".CommonPasswordValidator"
},
{
- 'NAME': 'django.contrib.auth.password_validation'
- '.NumericPasswordValidator',
+ "NAME": "django.contrib.auth.password_validation"
+ ".NumericPasswordValidator"
},
]
# Internationalization
# https://docs.djangoproject.com/en/1.9/topics/i18n/
-LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'Europe/Amsterdam'
+LANGUAGE_CODE = "en-us"
+TIME_ZONE = "Europe/Amsterdam"
USE_I18N = True
USE_L10N = True
USE_TZ = True
REST_FRAMEWORK = {
- 'DEFAULT_AUTHENTICATION_CLASSES': (
- 'rest_framework.authentication.BasicAuthentication',
- 'rest_framework.authentication.SessionAuthentication',
- 'rest_framework.authentication.TokenAuthentication',
+ "DEFAULT_AUTHENTICATION_CLASSES": (
+ "rest_framework.authentication.BasicAuthentication",
+ "rest_framework.authentication.SessionAuthentication",
+ "rest_framework.authentication.TokenAuthentication",
),
- 'DEFAULT_PERMISSION_CLASSES': (
- 'rest_framework.permissions.IsAuthenticated',
+ "DEFAULT_PERMISSION_CLASSES": (
+ "rest_framework.permissions.IsAuthenticated",
),
- 'DEFAULT_FILTER_BACKENDS':
- ('django_filters.rest_framework.DjangoFilterBackend',),
- 'DEFAULT_PAGINATION_CLASS':
- 'rest_framework.pagination.LimitOffsetPagination',
- 'PAGE_SIZE': 100
+ "DEFAULT_FILTER_BACKENDS": (
+ "django_filters.rest_framework.DjangoFilterBackend",
+ ),
+ "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
+ "PAGE_SIZE": 100,
}
SITE_ID = 1
@@ -172,44 +171,35 @@
ACCOUNT_LOGOUT_REDIRECT_URL = "/accounts/login/"
SOCIALACCOUNT_PROVIDERS = {
- 'google': {
- 'SCOPE': [
- 'profile',
- 'email',
- ],
- 'AUTH_PARAMS': {
- 'access_type': 'online',
- }
+ "google": {
+ "SCOPE": ["profile", "email"],
+ "AUTH_PARAMS": {"access_type": "online"},
}
}
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/
-STATIC_URL = '/static/'
+STATIC_URL = "/static/"
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
# Logging
# https://docs.djangoproject.com/en/2.0/topics/logging/#examples
LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': False,
- 'handlers': {
- 'file': {
- 'level': 'DEBUG',
- 'class': 'logging.FileHandler',
- 'filename': os.path.join(BASE_DIR, 'debug.log'),
- },
+ "version": 1,
+ "disable_existing_loggers": False,
+ "handlers": {
+ "file": {
+ "level": "DEBUG",
+ "class": "logging.FileHandler",
+ "filename": os.path.join(BASE_DIR, "debug.log"),
+ }
},
- 'loggers': {
- 'django': {
- 'handlers': ['file'],
- 'level': 'DEBUG',
- 'propagate': True,
- },
+ "loggers": {
+ "django": {"handlers": ["file"], "level": "DEBUG", "propagate": True}
},
}
@@ -217,9 +207,7 @@
# Automatic documentation generation
# https://drf-yasg.readthedocs.io/en/stable/index.html
-SWAGGER_SETTINGS = {
- 'DEFAULT_INFO': 'hiccup.urls.api_info',
-}
+SWAGGER_SETTINGS = {"DEFAULT_INFO": "hiccup.urls.api_info"}
try:
from local_settings import * # noqa: F403, F401
diff --git a/hiccup/urls.py b/hiccup/urls.py
index 3a6cf76..83fb1e0 100644
--- a/hiccup/urls.py
+++ b/hiccup/urls.py
@@ -4,14 +4,11 @@
from django.contrib import admin
from drf_yasg import openapi
-api_info = openapi.Info(
- title="Hiccup API",
- default_version='v1',
-)
+api_info = openapi.Info(title="Hiccup API", default_version="v1")
urlpatterns = [
- url(r'^hiccup/admin/', admin.site.urls),
- url(r'^hiccup/', include('crashreports.urls')),
- url(r'^hiccup_stats/', include('crashreport_stats.urls')),
- url(r'^accounts/', include('allauth.urls')),
+ url(r"^hiccup/admin/", admin.site.urls),
+ url(r"^hiccup/", include("crashreports.urls")),
+ url(r"^hiccup_stats/", include("crashreport_stats.urls")),
+ url(r"^accounts/", include("allauth.urls")),
]
diff --git a/hiccup/wsgi.py b/hiccup/wsgi.py
index 7f02368..025bc4e 100644
--- a/hiccup/wsgi.py
+++ b/hiccup/wsgi.py
@@ -6,7 +6,9 @@
"""
import os
+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hiccup.settings")
from django.core.wsgi import get_wsgi_application
+
application = get_wsgi_application()