Merge pull request #70 from maykinmedia/feature/update-black

Feature/update black
maykinmedia · Sep 21, 2020 · 935b39f · 935b39f
2 parents c807bd0 + 28d0555
commit 935b39f
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 29 deletions.
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -9,7 +9,7 @@ appdirs==1.4.3            # via black
 attrs==19.3.0             # via -r requirements/ci.txt, black, jsonschema
 babel==2.8.0              # via sphinx
 beautifulsoup4==4.9.0     # via -r requirements/ci.txt, webtest
-black==19.10b0            # via -r requirements/dev.in
+black==20.8b0            # via -r requirements/dev.in
 certifi==2020.4.5.1       # via -r requirements/ci.txt, elastic-apm, requests, sentry-sdk
 chardet==3.0.4            # via -r requirements/ci.txt, requests
 click==7.1.1              # via black, pip-tools

diff --git a/src/objects/accounts/migrations/0001_initial.py b/src/objects/accounts/migrations/0001_initial.py
@@ -118,7 +118,12 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "user", "verbose_name_plural": "users",},
-            managers=[("objects", objects.accounts.managers.UserManager()),],
+            options={
+                "verbose_name": "user",
+                "verbose_name_plural": "users",
+            },
+            managers=[
+                ("objects", objects.accounts.managers.UserManager()),
+            ],
         ),
     ]
diff --git a/src/objects/accounts/models.py b/src/objects/accounts/models.py
@@ -16,7 +16,9 @@ class User(AbstractBaseUser, PermissionsMixin):
         max_length=150,
         unique=True,
         help_text=_("Required. 150 characters or fewer."),
-        error_messages={"unique": _("A user with that username already exists."),},
+        error_messages={
+            "unique": _("A user with that username already exists."),
+        },
     )
     first_name = models.CharField(_("first name"), max_length=255, blank=True)
     last_name = models.CharField(_("last name"), max_length=255, blank=True)

diff --git a/src/objects/api/urls.py b/src/objects/api/urls.py
@@ -12,7 +12,9 @@
 
 schema_view = get_schema_view(
     openapi.Info(
-        title="Objects API", default_version="v1", description="OAS for Objects API",
+        title="Objects API",
+        default_version="v1",
+        description="OAS for Objects API",
     ),
     public=True,
     permission_classes=(permissions.AllowAny,),

diff --git a/src/objects/conf/base.py b/src/objects/conf/base.py
@@ -98,7 +98,9 @@
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [os.path.join(DJANGO_PROJECT_DIR, "templates"),],
+        "DIRS": [
+            os.path.join(DJANGO_PROJECT_DIR, "templates"),
+        ],
         "APP_DIRS": False,  # conflicts with explicity specifying the loaders
         "OPTIONS": {
             "context_processors": [
@@ -127,9 +129,15 @@
     {
         "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.MinimumLengthValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
+    },
 ]
 
 
@@ -193,14 +201,19 @@
             "format": "%(asctime)s %(process)d | %(thread)d | %(message)s",
         },
     },
-    "filters": {"require_debug_false": {"()": "django.utils.log.RequireDebugFalse"},},
+    "filters": {
+        "require_debug_false": {"()": "django.utils.log.RequireDebugFalse"},
+    },
     "handlers": {
         "mail_admins": {
             "level": "ERROR",
             "filters": ["require_debug_false"],
             "class": "django.utils.log.AdminEmailHandler",
         },
-        "null": {"level": "DEBUG", "class": "logging.NullHandler",},
+        "null": {
+            "level": "DEBUG",
+            "class": "logging.NullHandler",
+        },
         "console": {
             "level": "DEBUG",
             "class": "logging.StreamHandler",
@@ -232,7 +245,11 @@
         },
     },
     "loggers": {
-        "objects": {"handlers": ["project"], "level": "INFO", "propagate": True,},
+        "objects": {
+            "handlers": ["project"],
+            "level": "INFO",
+            "propagate": True,
+        },
         "django.request": {
             "handlers": ["django"],
             "level": "ERROR",

diff --git a/src/objects/conf/dev.py b/src/objects/conf/dev.py
@@ -32,14 +32,26 @@
 
 LOGGING["loggers"].update(
     {
-        "objects": {"handlers": ["console"], "level": "DEBUG", "propagate": True,},
-        "django": {"handlers": ["console"], "level": "DEBUG", "propagate": True,},
+        "objects": {
+            "handlers": ["console"],
+            "level": "DEBUG",
+            "propagate": True,
+        },
+        "django": {
+            "handlers": ["console"],
+            "level": "DEBUG",
+            "propagate": True,
+        },
         "django.db.backends": {
             "handlers": ["django"],
             "level": "DEBUG",
             "propagate": False,
         },
-        "performance": {"handlers": ["console"], "level": "INFO", "propagate": True,},
+        "performance": {
+            "handlers": ["console"],
+            "level": "INFO",
+            "propagate": True,
+        },
         #
         # See: https://code.djangoproject.com/ticket/30554
         # Autoreload logs excessively, turn it down a bit.
@@ -89,8 +101,12 @@
 # in memory cache and django-axes don't get along.
 # https://django-axes.readthedocs.io/en/latest/configuration.html#known-configuration-problems
 CACHES = {
-    "default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache",},
-    "axes_cache": {"BACKEND": "django.core.cache.backends.dummy.DummyCache",},
+    "default": {
+        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+    },
+    "axes_cache": {
+        "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+    },
 }
 
 AXES_CACHE = "axes_cache"

diff --git a/src/objects/conf/docker.py b/src/objects/conf/docker.py
@@ -35,9 +35,13 @@ def getenv(key, default=None, required=False, split=False):
 ALLOWED_HOSTS = getenv("ALLOWED_HOSTS", "*", split=True)
 
 CACHES = {
-    "default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache",},
+    "default": {
+        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+    },
     # https://github.com/jazzband/django-axes/blob/master/docs/configuration.rst#cache-problems
-    "axes_cache": {"BACKEND": "django.core.cache.backends.dummy.DummyCache",},
+    "axes_cache": {
+        "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+    },
 }
 
 # Deal with being hosted on a subpath

diff --git a/src/objects/conf/production.py b/src/objects/conf/production.py
@@ -60,7 +60,11 @@
 # Production logging facility.
 LOGGING["loggers"].update(
     {
-        "django": {"handlers": ["django"], "level": "INFO", "propagate": True,},
+        "django": {
+            "handlers": ["django"],
+            "level": "INFO",
+            "propagate": True,
+        },
         "django.security.DisallowedHost": {
             "handlers": ["django"],
             "level": "CRITICAL",

diff --git a/src/objects/conf/staging.py b/src/objects/conf/staging.py
@@ -54,7 +54,11 @@
 
 LOGGING["loggers"].update(
     {
-        "django": {"handlers": ["django"], "level": "INFO", "propagate": True,},
+        "django": {
+            "handlers": ["django"],
+            "level": "INFO",
+            "propagate": True,
+        },
         "django.security.DisallowedHost": {
             "handlers": ["django"],
             "level": "CRITICAL",

diff --git a/src/objects/core/migrations/0005_remove_object_data.py b/src/objects/core/migrations/0005_remove_object_data.py
@@ -10,5 +10,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(model_name="object", name="data",),
+        migrations.RemoveField(
+            model_name="object",
+            name="data",
+        ),
     ]
diff --git a/src/objects/core/migrations/0006_auto_20200904_1402.py b/src/objects/core/migrations/0006_auto_20200904_1402.py
@@ -14,7 +14,10 @@ class Migration(migrations.Migration):
         migrations.RenameField(
             model_name="objectrecord", old_name="material_date", new_name="start_date"
         ),
-        migrations.RemoveField(model_name="objectrecord", name="record_type",),
+        migrations.RemoveField(
+            model_name="objectrecord",
+            name="record_type",
+        ),
         migrations.AddField(
             model_name="objectrecord",
             name="end_date",

diff --git a/src/objects/core/migrations/0011_remove_object_version.py b/src/objects/core/migrations/0011_remove_object_version.py
@@ -10,5 +10,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(model_name="object", name="version",),
+        migrations.RemoveField(
+            model_name="object",
+            name="version",
+        ),
     ]
diff --git a/src/objects/tests/test_validation.py b/src/objects/tests/test_validation.py
@@ -36,7 +36,11 @@ def test_create_object_invalid_objecttype_url(self, m):
     def test_create_object_no_version(self, m):
         m.get(
             OBJECT_TYPE,
-            json={"url": OBJECT_TYPE, "name": "boom", "namePlural": "bomen",},
+            json={
+                "url": OBJECT_TYPE,
+                "name": "boom",
+                "namePlural": "bomen",
+            },
         )
 
         url = reverse("object-list")
@@ -152,7 +156,8 @@ def test_update_object_type_invalid(self, m):
         m.get(OBJECT_TYPE, json=mock_objecttype(OBJECT_TYPE))
 
         initial_record = ObjectRecordFactory.create(
-            data={"plantDate": "2020-04-12", "diameter": 30}, version=1,
+            data={"plantDate": "2020-04-12", "diameter": 30},
+            version=1,
         )
         object = initial_record.object
 
@@ -167,5 +172,6 @@ def test_update_object_type_invalid(self, m):
 
         data = response.json()
         self.assertEqual(
-            data["type"], ["This field can't be changed"],
+            data["type"],
+            ["This field can't be changed"],
         )
diff --git a/src/objects/tests/utils.py b/src/objects/tests/utils.py
@@ -13,7 +13,10 @@ def mock_objecttype(url: str) -> dict:
                     "type": "object",
                     "required": ["diameter"],
                     "properties": {
-                        "diameter": {"description": "size in cm.", "type": "integer",},
+                        "diameter": {
+                            "description": "size in cm.",
+                            "type": "integer",
+                        },
                         "plantDate": {
                             "type": "string",
                             "description": "the date the tree was planted.",

diff --git a/src/objects/urls.py b/src/objects/urls.py
@@ -49,4 +49,6 @@
 if settings.DEBUG and apps.is_installed("debug_toolbar"):
     import debug_toolbar
 
-    urlpatterns = [path("__debug__/", include(debug_toolbar.urls)),] + urlpatterns
+    urlpatterns = [
+        path("__debug__/", include(debug_toolbar.urls)),
+    ] + urlpatterns