Paint it black

Author: cache-rules

Makefile

@@ -39,3 +39,6 @@ logs: cmd:= logs -f
 exec: cmd:= exec $(name) $(c)
 dcps: cmd:= ps
 build push up down start stop restart logs exec dcps: docker_compose
+
+black:
+	black -l 100 .

config/settings/base.py

@@ -20,7 +20,7 @@
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get('SECRET_KEY')
+SECRET_KEY = os.environ.get("SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
@@ -31,101 +31,89 @@
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'rest_framework',
-    'nerd_herder',
-    'nerd_herder.code_of_conduct',
-    'nerd_herder.users',
-    'nerd_herder.speakers',
-    'nerd_herder.talk_proposals',
-    'nerd_herder.talks',
-    'nerd_herder.companies',
-    'nerd_herder.events',
-    'nerd_herder.slack',
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "rest_framework",
+    "nerd_herder",
+    "nerd_herder.code_of_conduct",
+    "nerd_herder.users",
+    "nerd_herder.speakers",
+    "nerd_herder.talk_proposals",
+    "nerd_herder.talks",
+    "nerd_herder.companies",
+    "nerd_herder.events",
+    "nerd_herder.slack",
 ]
 
 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    '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.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = 'config.urls'
+ROOT_URLCONF = "config.urls"
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        '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": [],
+        "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",
+            ]
         },
-    },
+    }
 ]
 
-WSGI_APPLICATION = 'config.wsgi.application'
+WSGI_APPLICATION = "config.wsgi.application"
 
 
 # Database
 # https://docs.djangoproject.com/en/2.0/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"),
     }
 }
 
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-    }
-}
+CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}
 
 # User substitution
 # https://docs.djangoproject.com/en/1.11/topics/auth/customizing/#auth-custom-user
 
-AUTH_USER_MODEL = 'users.User'
+AUTH_USER_MODEL = "users.User"
 
 # Password validation
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
+    {"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"},
+    {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
+    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
+    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
 ]
 
 
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"
 
 USE_I18N = True
 
@@ -137,16 +125,16 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_URL = "/static/"
 
 # ASSET_MANIFEST_HOST is used in prod/staging to download the asset manifest created by
 # CreateReactApp, this way we can point to the built CSS styles.
-ASSET_MANIFEST_HOST = os.environ.get('ASSET_MANIFEST_HOST')
+ASSET_MANIFEST_HOST = os.environ.get("ASSET_MANIFEST_HOST")
 
 # Slack settings
-SLACK_BOT_USER_TOKEN = os.environ.get('SLACK_BOT_USER_TOKEN')
-SLACK_VERIFICATION_TOKEN = os.environ.get('SLACK_VERIFICATION_TOKEN')
-SLACK_BOT_NAME = os.environ.get('SLACK_BOT_NAME', 'nerd_herder')
-SLACK_BOT_EMOJI = os.environ.get('SLACK_BOT_EMOJI', 'snake')
-SLACK_TALK_PROPOSAL_CHANNEL = os.environ.get('SLACK_TALK_PROPOSAL_CHANNEL', 'talk_proposals')
+SLACK_BOT_USER_TOKEN = os.environ.get("SLACK_BOT_USER_TOKEN")
+SLACK_VERIFICATION_TOKEN = os.environ.get("SLACK_VERIFICATION_TOKEN")
+SLACK_BOT_NAME = os.environ.get("SLACK_BOT_NAME", "nerd_herder")
+SLACK_BOT_EMOJI = os.environ.get("SLACK_BOT_EMOJI", "snake")
+SLACK_TALK_PROPOSAL_CHANNEL = os.environ.get("SLACK_TALK_PROPOSAL_CHANNEL", "talk_proposals")

config/settings/docker.py

@@ -1,37 +1,35 @@
 from nerd_herder.utils import init_logging
 from .base import *
 
-DEBUG = os.environ.get('DEBUG') == 'TRUE'
-ALLOWED_HOSTS = ['*']
+DEBUG = os.environ.get("DEBUG") == "TRUE"
+ALLOWED_HOSTS = ["*"]
 
-POSTGRES_HOST = os.environ.get('POSTGRES_HOST', 'postgres')
-POSTGRES_PORT = os.environ.get('POSTGRES_PORT', '5432')
-POSTGRES_USER = os.environ.get('POSTGRES_USER', 'postgres')
-POSTGRES_PASSWORD = os.environ.get('POSTGRES_PASSWORD')
-POSTGRES_DB = os.environ.get('POSTGRES_DB', 'nerd_herder')
+POSTGRES_HOST = os.environ.get("POSTGRES_HOST", "postgres")
+POSTGRES_PORT = os.environ.get("POSTGRES_PORT", "5432")
+POSTGRES_USER = os.environ.get("POSTGRES_USER", "postgres")
+POSTGRES_PASSWORD = os.environ.get("POSTGRES_PASSWORD")
+POSTGRES_DB = os.environ.get("POSTGRES_DB", "nerd_herder")
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': POSTGRES_DB,
-        'USER': POSTGRES_USER,
-        'PASSWORD': POSTGRES_PASSWORD,
-        'HOST': POSTGRES_HOST,
-        'PORT': POSTGRES_PORT,
-    },
+    "default": {
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": POSTGRES_DB,
+        "USER": POSTGRES_USER,
+        "PASSWORD": POSTGRES_PASSWORD,
+        "HOST": POSTGRES_HOST,
+        "PORT": POSTGRES_PORT,
+    }
 }
 
-REDIS_HOST = os.environ.get('REDIS_HOST', 'redis')
-REDIS_PORT = os.environ.get('REDIS_PORT', '6379')
+REDIS_HOST = os.environ.get("REDIS_HOST", "redis")
+REDIS_PORT = os.environ.get("REDIS_PORT", "6379")
 
 CACHES = {
-    'default': {
-        'BACKEND': 'django_redis.cache.RedisCache',
-        'LOCATION': f'redis://{REDIS_HOST}:{REDIS_PORT}/0',
-        'OPTIONS': {
-            'CLIENT_CLASS': 'django_redis.client.DefaultClient',
-        },
-    },
+    "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": f"redis://{REDIS_HOST}:{REDIS_PORT}/0",
+        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient"},
+    }
 }
 
 init_logging()

config/settings/test.py

@@ -1,7 +1,3 @@
 from config.settings.base import *
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-    }
-}
+DATABASES = {"default": {"ENGINE": "django.db.backends.postgresql"}}

config/urls.py

@@ -17,11 +17,15 @@
 from django.urls import path, include
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
-    path('pages/code-of-conduct/',
-         include('nerd_herder.code_of_conduct.urls', namespace='code_of_conduct')),
-    path('api/v1/talks/', include('nerd_herder.talks.urls', namespace='talks')),
-    path('api/v1/talk-proposals/',
-         include('nerd_herder.talk_proposals.urls', namespace='talk_proposals')),
-    path('api/v1/slack/', include('nerd_herder.slack.urls', namespace='slack')),
+    path("admin/", admin.site.urls),
+    path(
+        "pages/code-of-conduct/",
+        include("nerd_herder.code_of_conduct.urls", namespace="code_of_conduct"),
+    ),
+    path("api/v1/talks/", include("nerd_herder.talks.urls", namespace="talks")),
+    path(
+        "api/v1/talk-proposals/",
+        include("nerd_herder.talk_proposals.urls", namespace="talk_proposals"),
+    ),
+    path("api/v1/slack/", include("nerd_herder.slack.urls", namespace="slack")),
 ]

nerd_herder/code_of_conduct/__init__.py

@@ -1 +1 @@
-default_app_config = 'nerd_herder.code_of_conduct.apps.CodeOfConductConfig'
+default_app_config = "nerd_herder.code_of_conduct.apps.CodeOfConductConfig"

nerd_herder/code_of_conduct/admin.py

@@ -5,7 +5,7 @@
 
 class CommitteeMemberModelAdmin(admin.ModelAdmin):
     model = CommitteeMember
-    list_display = ('name', 'email', 'slack')
+    list_display = ("name", "email", "slack")
 
 
 admin.site.register(CommitteeMember, CommitteeMemberModelAdmin)

nerd_herder/code_of_conduct/apps.py

@@ -2,5 +2,5 @@
 
 
 class CodeOfConductConfig(AppConfig):
-    name = 'nerd_herder.code_of_conduct'
-    verbose_name = 'Code of Conduct'
+    name = "nerd_herder.code_of_conduct"
+    verbose_name = "Code of Conduct"

nerd_herder/code_of_conduct/migrations/0001_initial.py

@@ -7,17 +7,21 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='CommitteeMember',
+            name="CommitteeMember",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=256)),
-                ('email', models.EmailField(max_length=254)),
-                ('slack', models.CharField(max_length=64)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("name", models.CharField(max_length=256)),
+                ("email", models.EmailField(max_length=254)),
+                ("slack", models.CharField(max_length=64)),
             ],
-        ),
+        )
     ]

nerd_herder/code_of_conduct/urls.py

@@ -1,12 +1,15 @@
 from django.urls import path
 
-from nerd_herder.code_of_conduct.views import code_of_conduct, code_of_conduct_reporting_guide,\
-    code_of_conduct_response_playbook
+from nerd_herder.code_of_conduct.views import (
+    code_of_conduct,
+    code_of_conduct_reporting_guide,
+    code_of_conduct_response_playbook,
+)
 
-app_name = 'code_of_conduct'
+app_name = "code_of_conduct"
 
 urlpatterns = [
-    path('', code_of_conduct),
-    path('reporting-guide', code_of_conduct_reporting_guide),
-    path('response-playbook', code_of_conduct_response_playbook),
+    path("", code_of_conduct),
+    path("reporting-guide", code_of_conduct_reporting_guide),
+    path("response-playbook", code_of_conduct_response_playbook),
 ]

nerd_herder/code_of_conduct/views.py

@@ -6,22 +6,22 @@
 
 def code_of_conduct(request):
     _, css_url = get_asset_urls()
-    context = {'title': 'Code of Conduct', 'css_url': css_url}
-    return render(request, 'code_of_conduct.html', context)
+    context = {"title": "Code of Conduct", "css_url": css_url}
+    return render(request, "code_of_conduct.html", context)
 
 
 def code_of_conduct_reporting_guide(request):
     _, css_url = get_asset_urls()
     context = {
-        'title': 'Code of Conduct',
-        'css_url': css_url,
-        'committee_members': CommitteeMember.objects.all(),
+        "title": "Code of Conduct",
+        "css_url": css_url,
+        "committee_members": CommitteeMember.objects.all(),
     }
 
-    return render(request, 'code-of-conduct-reporting-guide.html', context)
+    return render(request, "code-of-conduct-reporting-guide.html", context)
 
 
 def code_of_conduct_response_playbook(request):
     _, css_url = get_asset_urls()
-    context = {'title': 'Code of Conduct - Response Playbook', 'css_url': css_url}
-    return render(request, 'code-of-conduct-response-playbook.html', context)
+    context = {"title": "Code of Conduct - Response Playbook", "css_url": css_url}
+    return render(request, "code-of-conduct-response-playbook.html", context)

nerd_herder/companies/apps.py

@@ -2,4 +2,4 @@
 
 
 class CompaniesConfig(AppConfig):
-    name = 'nerd_herder.companies'
+    name = "nerd_herder.companies"