formatted python code with black

briancaffey · briancaffey · commit fe08e92c1358 · 2020-11-24T22:03:55.000-05:00
diff --git a/backend/apps/accounts/admin.py b/backend/apps/accounts/admin.py
@@ -28,13 +28,7 @@ class CustomUserAdmin(UserAdmin):
             None,
             {
                 "classes": ("wide",),
-                "fields": (
-                    "email",
-                    "password1",
-                    "password2",
-                    "is_staff",
-                    "is_active",
-                ),
+                "fields": ("email", "password1", "password2", "is_staff", "is_active",),
             },
         ),
     )
diff --git a/backend/apps/accounts/migrations/0001_initial.py b/backend/apps/accounts/migrations/0001_initial.py
@@ -74,16 +74,13 @@ class Migration(migrations.Migration):
                 (
                     "date_joined",
                     models.DateTimeField(
-                        default=django.utils.timezone.now,
-                        verbose_name="date joined",
+                        default=django.utils.timezone.now, verbose_name="date joined",
                     ),
                 ),
                 (
                     "email",
                     models.EmailField(
-                        max_length=254,
-                        unique=True,
-                        verbose_name="email address",
+                        max_length=254, unique=True, verbose_name="email address",
                     ),
                 ),
                 (
diff --git a/backend/apps/accounts/migrations/0002_auto_20201117_0735.py b/backend/apps/accounts/migrations/0002_auto_20201117_0735.py
@@ -6,13 +6,15 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounts', '0001_initial'),
+        ("accounts", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='customuser',
-            name='first_name',
-            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+            model_name="customuser",
+            name="first_name",
+            field=models.CharField(
+                blank=True, max_length=150, verbose_name="first name"
+            ),
         ),
     ]
diff --git a/backend/apps/accounts/tests.py b/backend/apps/accounts/tests.py
@@ -9,9 +9,7 @@
 
 class UsersManagersTests(TestCase):
     def test_create_user(self):
-        user = User.objects.create_user(
-            email="normal@user.com", password="foo"
-        )
+        user = User.objects.create_user(email="normal@user.com", password="foo")
         self.assertEqual(user.email, "normal@user.com")
         self.assertTrue(user.is_active)
         self.assertFalse(user.is_staff)
@@ -58,17 +56,13 @@ def test_obtain_jwt(self):
         u.save()
 
         resp = self.client.post(
-            url,
-            {"email": "user@foo.com", "password": "password"},
-            format="json",
+            url, {"email": "user@foo.com", "password": "password"}, format="json",
         )
         self.assertEqual(resp.status_code, status.HTTP_401_UNAUTHORIZED)
         u.is_active = True
         u.save()
         resp = self.client.post(
-            url,
-            {"email": "user@foo.com", "password": "password"},
-            format="json",
+            url, {"email": "user@foo.com", "password": "password"}, format="json",
         )
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         self.assertTrue("access" in resp.data)
diff --git a/backend/apps/accounts/urls.py b/backend/apps/accounts/urls.py
@@ -4,20 +4,12 @@
 
 
 urlpatterns = [
-    path('login-set-cookie/', views.login_set_cookie, name="login-view"),
-    path('login/', views.login_view, name="login-view"),
-    path('logout/', views.logout_view, name="logout-view"),
-    path(
-        "users/profile/",
-        views.Profile.as_view(),
-        name="user-profile",
-    ),
+    path("login-set-cookie/", views.login_set_cookie, name="login-view"),
+    path("login/", views.login_view, name="login-view"),
+    path("logout/", views.logout_view, name="logout-view"),
+    path("users/profile/", views.Profile.as_view(), name="user-profile",),
     # Social Auth Callbacks
-    path(
-        "social/<backend>/",
-        views.exchange_token,
-        name="social-auth",
-    ),
+    path("social/<backend>/", views.exchange_token, name="social-auth",),
 ]
 
 urlpatterns += [
diff --git a/backend/apps/accounts/views.py b/backend/apps/accounts/views.py
@@ -43,8 +43,8 @@ def login_view(request):
     and HttpOnly cookie, the `sessionid` cookie
     """
     data = json.loads(request.body)
-    email = data.get('email')
-    password = data.get('password')
+    email = data.get("email")
+    password = data.get("password")
     if email is None or password is None:
         return JsonResponse(
             {"errors": {"__all__": "Please enter both username and password"}},
@@ -71,10 +71,7 @@ class SocialSerializer(serializers.Serializer):
     Serializer which accepts an OAuth2 code.
     """
 
-    code = serializers.CharField(
-        allow_blank=False,
-        trim_whitespace=True,
-    )
+    code = serializers.CharField(allow_blank=False, trim_whitespace=True,)
 
 
 @api_view(http_method_names=["POST"])
diff --git a/backend/apps/banking/migrations/0002_auto_20200126_1558.py b/backend/apps/banking/migrations/0002_auto_20200126_1558.py
@@ -15,9 +15,7 @@ class Migration(migrations.Migration):
             model_name="statementfile",
             name="statement_file",
             field=models.FileField(
-                storage=django.core.files.storage.FileSystemStorage(
-                    location="/code/"
-                ),
+                storage=django.core.files.storage.FileSystemStorage(location="/code/"),
                 upload_to="",
             ),
         ),
diff --git a/backend/apps/banking/migrations/0005_auto_20200606_1325.py b/backend/apps/banking/migrations/0005_auto_20200606_1325.py
@@ -7,16 +7,16 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('banking', '0004_transaction_source_file'),
+        ("banking", "0004_transaction_source_file"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='statementfile',
-            name='statement_file',
+            model_name="statementfile",
+            name="statement_file",
             field=models.FileField(
                 storage=backend.storage_backends.PrivateMediaStorage,
-                upload_to='banking',
+                upload_to="banking",
             ),
         ),
     ]
diff --git a/backend/apps/banking/models.py b/backend/apps/banking/models.py
@@ -6,9 +6,7 @@
 
 
 class StatementFile(models.Model):
-    statement_file = models.FileField(
-        storage=PrivateMediaStorage, upload_to="banking"
-    )
+    statement_file = models.FileField(storage=PrivateMediaStorage, upload_to="banking")
     month = models.DateField(null=False, blank=False)
 
     def __str__(self):
diff --git a/backend/apps/banking/tasks.py b/backend/apps/banking/tasks.py
@@ -22,9 +22,7 @@ def process_statement_file(self, statement_file_id):
     of the transactions with one bulk create database operation
     """
 
-    statement_file = StatementFile.objects.get(
-        id=statement_file_id
-    ).statement_file
+    statement_file = StatementFile.objects.get(id=statement_file_id).statement_file
     file_data = statement_file.read().decode("utf-8")
     csv_data = csv.DictReader(StringIO(file_data), delimiter=",")
 
diff --git a/backend/apps/banking/views.py b/backend/apps/banking/views.py
@@ -37,9 +37,7 @@ def post(self, request):
         # we could also do this on the frontend
         date = form_data["month"]
         formatted_date = (
-            datetime.datetime.strptime(date, "%Y-%m-%d")
-            .date()
-            .strftime("%Y-%m-%d")
+            datetime.datetime.strptime(date, "%Y-%m-%d").date().strftime("%Y-%m-%d")
         )
         form_data.update(dict(month_year=formatted_date))
         source_file = request.FILES["file"]
diff --git a/backend/apps/core/constants.py b/backend/apps/core/constants.py
@@ -2,10 +2,7 @@
 # https://developers.google.com/identity/protocols/OpenIDConnect
 
 OAUTH = {
-    "github": {
-        "name": "github",
-        "url": "https://github.com/login/oauth/access_token",
-    },
+    "github": {"name": "github", "url": "https://github.com/login/oauth/access_token",},
     "google-oauth2": {
         "name": "google-oauth2",
         "url": "https://oauth2.googleapis.com/token",
diff --git a/backend/apps/core/consumers.py b/backend/apps/core/consumers.py
@@ -16,17 +16,13 @@ async def connect(self):
 
         # Join room group
         print(self.channel_name)  # noqa
-        await self.channel_layer.group_add(
-            self.ping_pong_group, self.channel_name
-        )
+        await self.channel_layer.group_add(self.ping_pong_group, self.channel_name)
 
         await self.accept()
 
     async def disconnect(self, close_code):
         # Leave room group
-        await self.channel_layer.group_discard(
-            self.ping_pong_group, self.channel_name
-        )
+        await self.channel_layer.group_discard(self.ping_pong_group, self.channel_name)
 
     # Receive message from WebSocket
     async def receive(self, text_data):
diff --git a/backend/apps/core/management/commands/create_default_user.py b/backend/apps/core/management/commands/create_default_user.py
@@ -13,8 +13,7 @@ def handle(self, *args, **options):
         if not User.objects.all():
             print("Creating default user")
             User.objects.create_superuser(
-                email="admin@company.com",
-                password=password,
+                email="admin@company.com", password=password,
             )
             print(
                 """
diff --git a/backend/apps/core/middleware/healthchecks.py b/backend/apps/core/middleware/healthchecks.py
@@ -43,14 +43,10 @@ def readiness(self, request):
                 cursor.execute("SELECT 1;")
                 row = cursor.fetchone()
                 if row is None:
-                    return HttpResponseServerError(
-                        "Postgres: invalid response"
-                    )
+                    return HttpResponseServerError("Postgres: invalid response")
         except Exception as e:
             logger.exception(e)
-            return HttpResponseServerError(
-                "Postgres: cannot connect to database."
-            )
+            return HttpResponseServerError("Postgres: cannot connect to database.")
 
         # Call get_stats() to connect to each memcached
         # instance and get it's stats.
diff --git a/backend/apps/core/routing.py b/backend/apps/core/routing.py
@@ -3,8 +3,5 @@
 from . import consumers
 
 websocket_urlpatterns = [
-    url(
-        r"^ws/ping-pong/$",
-        consumers.CoreConsumer.as_asgi(),
-    ),
+    url(r"^ws/ping-pong/$", consumers.CoreConsumer.as_asgi(),),
 ]
diff --git a/backend/apps/core/urls.py b/backend/apps/core/urls.py
@@ -6,16 +6,10 @@
     path("health-check/", views.health_check, name="health-check"),
     path("celery-metrics/", views.celery_metrics, name="celery-metrics"),
     path("celery/sleep-task/", views.sleep_task_view, name="sleep-task"),
-    path(
-        "debug/send-test-email/",
-        views.send_test_email,
-        name="send-test-email",
-    ),
+    path("debug/send-test-email/", views.send_test_email, name="send-test-email",),
     path(
         "debug/redis/",
-        views.DebugRedis.as_view(
-            {"get": "get", "post": "post", "delete": "delete"}
-        ),
+        views.DebugRedis.as_view({"get": "get", "post": "post", "delete": "delete"}),
         name="debug-redis",
     ),
 ]
diff --git a/backend/apps/core/utils/celery_utils.py b/backend/apps/core/utils/celery_utils.py
@@ -25,7 +25,7 @@ def active_and_reserved_tasks_by_queue_name(queue_name):
                 [
                     task
                     for task in active_tasks
-                    if task['delivery_info']['routing_key'] == queue_name
+                    if task["delivery_info"]["routing_key"] == queue_name
                 ]
             )
 
@@ -37,7 +37,7 @@ def active_and_reserved_tasks_by_queue_name(queue_name):
                 [
                     task
                     for task in reserved_tasks
-                    if task['delivery_info']['routing_key'] == queue_name
+                    if task["delivery_info"]["routing_key"] == queue_name
                 ]
             )
 
@@ -68,7 +68,7 @@ def publish_queue_metrics(queue_names):
     print("sending cloudwatch data")
     if not settings.DEBUG:
         print("connecting aws api")
-        client = boto3.client('cloudwatch')
+        client = boto3.client("cloudwatch")
         client.put_metric_data(
             Namespace=os.environ.get("FULL_APP_NAME", "FULL_APP_NAME"),
             MetricData=[
diff --git a/backend/apps/core/views.py b/backend/apps/core/views.py
@@ -45,12 +45,8 @@ def health_check(request):
 @api_view(["POST"])
 def sleep_task_view(request):
     sleep_seconds = request.data.get("seconds")
-    sleep_task.apply_async(
-        [sleep_seconds], queue=settings.CELERY_QUEUE_DEFAULT
-    )
-    return JsonResponse(
-        {"message": f"Sleep task submitted ({sleep_seconds} seconds)"}
-    )
+    sleep_task.apply_async([sleep_seconds], queue=settings.CELERY_QUEUE_DEFAULT)
+    return JsonResponse({"message": f"Sleep task submitted ({sleep_seconds} seconds)"})
 
 
 @api_view(["POST"])
diff --git a/backend/apps/hn/models.py b/backend/apps/hn/models.py
@@ -13,9 +13,5 @@ class Link(models.Model):
 
 
 class Vote(models.Model):
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL, on_delete=models.CASCADE
-    )
-    link = models.ForeignKey(
-        Link, related_name="votes", on_delete=models.CASCADE
-    )
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    link = models.ForeignKey(Link, related_name="votes", on_delete=models.CASCADE)
diff --git a/backend/apps/hn/schema.py b/backend/apps/hn/schema.py
@@ -19,21 +19,14 @@ class Meta:
 
 class Query(graphene.ObjectType):
     links = graphene.List(
-        LinkType,
-        search=graphene.String(),
-        first=graphene.Int(),
-        skip=graphene.Int(),
+        LinkType, search=graphene.String(), first=graphene.Int(), skip=graphene.Int(),
     )
     votes = graphene.List(VoteType)
 
-    def resolve_links(
-        self, info, search=None, first=None, skip=None, **kwargs
-    ):
+    def resolve_links(self, info, search=None, first=None, skip=None, **kwargs):
         qs = Link.objects.all()
         if search:
-            filter = Q(url__icontains=search) | Q(
-                description__icontains=search
-            )
+            filter = Q(url__icontains=search) | Q(description__icontains=search)
             qs = qs.filter(filter)
 
         if skip:
diff --git a/backend/backend/schema.py b/backend/backend/schema.py
@@ -12,9 +12,7 @@ class Query(
 
 
 class Mutation(
-    apps.accounts.schema.Mutation,
-    apps.hn.schema.Mutation,
-    graphene.ObjectType,
+    apps.accounts.schema.Mutation, apps.hn.schema.Mutation, graphene.ObjectType,
 ):
     token_auth = graphql_jwt.ObtainJSONWebToken.Field()
     verify_token = graphql_jwt.Verify.Field()
diff --git a/backend/backend/settings/base.py b/backend/backend/settings/base.py
diff --git a/backend/backend/settings/minikube.py b/backend/backend/settings/minikube.py
diff --git a/backend/backend/storage_backends.py b/backend/backend/storage_backends.py
diff --git a/backend/backend/urls.py b/backend/backend/urls.py

Original file line number	Diff line number	Diff line change
`@@ -74,16 +74,13 @@ class Migration(migrations.Migration):`
`74`	`74`	`(`
`75`	`75`	`"date_joined",`
`76`	`76`	`models.DateTimeField(`
`77`		`- default=django.utils.timezone.now,`
`78`		`- verbose_name="date joined",`
	`77`	`+ default=django.utils.timezone.now, verbose_name="date joined",`
`79`	`78`	`),`
`80`	`79`	`),`
`81`	`80`	`(`
`82`	`81`	`"email",`
`83`	`82`	`models.EmailField(`
`84`		`- max_length=254,`
`85`		`- unique=True,`
`86`		`- verbose_name="email address",`
	`83`	`+ max_length=254, unique=True, verbose_name="email address",`
`87`	`84`	`),`
`88`	`85`	`),`
`89`	`86`	`(`