Merged with test (opravene pre-commit-hooks, znova aplikovan isort)

.isort.cfg

@@ -2,6 +2,6 @@
 # config compatible with Black
 line_length = 88
 multi_line_output = 3
-default_sectiont = "THIRDPARTY"
+default_section = "THIRDPARTY"
 include_trailing_comma = true
 known_third_party = arrow,django,environ,faker,ics,markdown,modelcluster,nbconvert,pirates,pytest,pytz,requests,requests_cache,sentry_sdk,snapshottest,taggit,traitlets,wagtail,wagtailmetadata

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ default_language_version:
 exclude: snapshots/
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v3.3.0
     hooks:
       - id: trailing-whitespace
         exclude: ^.*\.md$
@@ -16,11 +16,16 @@ repos:
       - id: check-merge-conflict
 
   - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.1.0
+    rev: v2.2.0
     hooks:
       - id: seed-isort-config
 
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.6.4
+    hooks:
+      - id: isort
+
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black

calendar_utils/migrations/0002_auto_20200523_0243.py

@@ -11,6 +11,8 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AlterField(
-            model_name="calendar", name="url", field=models.URLField(),
+            model_name="calendar",
+            name="url",
+            field=models.URLField(),
         ),
     ]

district/migrations/0001_initial.py

@@ -74,7 +74,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Web místního sdružení",},
+            options={
+                "verbose_name": "Web místního sdružení",
+            },
             bases=(
                 wagtailmetadata.models.MetadataMixin,
                 "wagtailcore.page",

district/migrations/0002_districtarticles.py

@@ -48,7 +48,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Aktuality",},
+            options={
+                "verbose_name": "Aktuality",
+            },
             bases=(
                 wagtailmetadata.models.MetadataMixin,
                 "wagtailcore.page",

district/migrations/0008_districtcontact.py

@@ -71,7 +71,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(
                 district.models.SubpageMixin,
                 wagtailmetadata.models.MetadataMixin,

district/migrations/0009_auto_20201014_1343.py

@@ -11,7 +11,8 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AlterModelOptions(
-            name="districtcontact", options={"verbose_name": "Kontakty"},
+            name="districtcontact",
+            options={"verbose_name": "Kontakty"},
         ),
         migrations.AddField(
             model_name="districthomepage",

district/migrations/0010_districttags.py

@@ -42,7 +42,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Stránka s tagy",},
+            options={
+                "verbose_name": "Stránka s tagy",
+            },
             bases=(
                 shared.models.SharedSubpageMixin,
                 wagtailmetadata.models.MetadataMixin,

district/models.py

@@ -12,8 +12,8 @@ from shared.models import Article, PeoplePage, SharedSubpageMixin
 
 class SubpageMixin:
     """Must be used in class definition before MetadataPageMixin!
-        Obsolete, misto nej pouzivat SharedSubpageMixin
-        TODO je pouze v migracich, po odstraneni z nich lze smazat
+    Obsolete, misto nej pouzivat SharedSubpageMixin
+    TODO je pouze v migracich, po odstraneni z nich lze smazat
     """
 
     pass
@@ -23,7 +23,9 @@ class DistrictHomePage(MetadataPageMixin, Page):
     ### FIELDS
 
     content = StreamField(
-        [("title", blocks.CharBlock(label="nadpis", icon="title")),],
+        [
+            ("title", blocks.CharBlock(label="nadpis", icon="title")),
+        ],
         verbose_name="obsah stránky",
         blank=True,
     )
@@ -78,7 +80,10 @@ class DistrictHomePage(MetadataPageMixin, Page):
 
     promote_panels = [
         MultiFieldPanel(
-            [FieldPanel("facebook"), FieldPanel("forum"),],
+            [
+                FieldPanel("facebook"),
+                FieldPanel("forum"),
+            ],
             gettext_lazy("Common page configuration"),
         ),
     ]
@@ -172,7 +177,8 @@ class DistrictArticles(SharedSubpageMixin, MetadataPageMixin, Page):
     def get_context(self, request):
         context = super().get_context(request)
         context["articles"] = Paginator(
-            self.get_children().live().specific(), self.max_items or 5,
+            self.get_children().live().specific(),
+            self.max_items or 5,
         ).get_page(request.GET.get("page"))
         return context
 
@@ -181,14 +187,17 @@ class DistrictContact(SharedSubpageMixin, MetadataPageMixin, Page):
     class ContactItemBlock(blocks.StructBlock):
         name = blocks.CharBlock(label="Role")
         person = blocks.PageChooserBlock(
-            label="Osoba", page_type=["shared.PersonPage"],
+            label="Osoba",
+            page_type=["shared.PersonPage"],
         )
 
         class Meta:
             label = "Kontakt"
 
     contact_persons = StreamField(
-        [("item", ContactItemBlock())], verbose_name="Kontakty", blank=True,
+        [("item", ContactItemBlock())],
+        verbose_name="Kontakty",
+        blank=True,
     )
 
     content_panels = Page.content_panels + [

districts/migrations/0001_initial.py

@@ -49,7 +49,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Krajský rozcestník",},
+            options={
+                "verbose_name": "Krajský rozcestník",
+            },
             bases=(
                 wagtailmetadata.models.MetadataMixin,
                 "wagtailcore.page",

donate/migrations/0001_initial.py

@@ -31,7 +31,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Přehled projektů",},
+            options={
+                "verbose_name": "Přehled projektů",
+            },
             bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
@@ -49,7 +51,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Přehled krajů",},
+            options={
+                "verbose_name": "Přehled krajů",
+            },
             bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
@@ -78,7 +82,9 @@ class Migration(migrations.Migration):
                 ),
                 ("body", wagtail.core.fields.RichTextField(verbose_name="obsah")),
             ],
-            options={"verbose_name": "Kraj",},
+            options={
+                "verbose_name": "Kraj",
+            },
             bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
@@ -128,7 +134,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Projekt",},
+            options={
+                "verbose_name": "Projekt",
+            },
             bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
@@ -228,7 +236,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Dary",},
+            options={
+                "verbose_name": "Dary",
+            },
             bases=("wagtailcore.page",),
         ),
     ]

donate/migrations/0003_donatecookiespage_donateinfopage.py

@@ -47,7 +47,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Info",},
+            options={
+                "verbose_name": "Info",
+            },
             bases=(
                 "wagtailcore.page",
                 donate.models.SubpageMixin,
@@ -85,7 +87,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Cookies",},
+            options={
+                "verbose_name": "Cookies",
+            },
             bases=(
                 "wagtailcore.page",
                 donate.models.SubpageMixin,

donate/migrations/0005_auto_20200715_1415.py

@@ -18,7 +18,10 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(model_name="donateregionpage", name="perex",),
+        migrations.RemoveField(
+            model_name="donateregionpage",
+            name="perex",
+        ),
         migrations.CreateModel(
             name="DonateTargetedDonationsPage",
             fields=[
@@ -80,7 +83,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(
                 "wagtailcore.page",
                 donate.models.SubpageMixin,

donate/migrations/0007_auto_20200724_1658.py

@@ -18,12 +18,15 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RenameModel(
-            old_name="DonateCookiesPage", new_name="DonateTextPage",
+            old_name="DonateCookiesPage",
+            new_name="DonateTextPage",
         ),
         migrations.AlterModelOptions(
-            name="donateinfopage", options={"verbose_name": "Infostránka s formulářem"},
+            name="donateinfopage",
+            options={"verbose_name": "Infostránka s formulářem"},
         ),
         migrations.AlterModelOptions(
-            name="donatetextpage", options={"verbose_name": "Stránka s textem"},
+            name="donatetextpage",
+            options={"verbose_name": "Stránka s textem"},
         ),
     ]

donate/migrations/0012_auto_20200915_0114.py

@@ -13,7 +13,8 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RemoveField(
-            model_name="donatetargeteddonationspage", name="targeted_donations",
+            model_name="donatetargeteddonationspage",
+            name="targeted_donations",
         ),
         migrations.CreateModel(
             name="TargetedDonation",
@@ -63,6 +64,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"ordering": ["sort_order"], "abstract": False,},
+            options={
+                "ordering": ["sort_order"],
+                "abstract": False,
+            },
         ),
     ]

donate/models.py

@@ -119,13 +119,16 @@ class DonateHomePage(DonateFormMixin, Page, MetadataPageMixin):
             "hlavní sekce",
         ),
         MultiFieldPanel(
-            [FieldPanel("support_title"), FieldPanel("support_body")], "podpoř stranu",
+            [FieldPanel("support_title"), FieldPanel("support_body")],
+            "podpoř stranu",
         ),
         MultiFieldPanel(
-            [FieldPanel("project_title"), FieldPanel("project_body")], "podpoř projekt",
+            [FieldPanel("project_title"), FieldPanel("project_body")],
+            "podpoř projekt",
         ),
         MultiFieldPanel(
-            [FieldPanel("region_title"), FieldPanel("region_body")], "podpoř kraj",
+            [FieldPanel("region_title"), FieldPanel("region_body")],
+            "podpoř kraj",
         ),
     ]
 

home/migrations/0001_initial.py

@@ -30,7 +30,9 @@ class Migration(migrations.Migration):
                 ),
                 ("body", wagtail.core.fields.RichTextField(verbose_name="obsah")),
             ],
-            options={"verbose_name": "Maják homepage",},
+            options={
+                "verbose_name": "Maják homepage",
+            },
             bases=("wagtailcore.page",),
         ),
     ]

home/migrations/0002_homeunderconstructionpage.py

@@ -27,7 +27,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Web se připravuje",},
+            options={
+                "verbose_name": "Web se připravuje",
+            },
             bases=("wagtailcore.page",),
         ),
     ]

majak/settings/base.py

@@ -191,7 +191,9 @@ CACHES["renditions"]["TIMEOUT"] = 60 * 60 * 24
 SENTRY_DSN = env.str("SENTRY_DSN", default="")
 if SENTRY_DSN:
     sentry_sdk.init(
-        dsn=SENTRY_DSN, integrations=[DjangoIntegration()], send_default_pii=True,
+        dsn=SENTRY_DSN,
+        integrations=[DjangoIntegration()],
+        send_default_pii=True,
     )
 
 # WAGTAIL SETTINGS

program2021/migrations/0001_initial.py

@@ -36,7 +36,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Program 2021",},
+            options={
+                "verbose_name": "Program 2021",
+            },
             bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
@@ -259,7 +261,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"verbose_name": "Programový bod",},
+            options={
+                "verbose_name": "Programový bod",
+            },
             bases=(
                 "wagtailcore.page",
                 wagtailmetadata.models.MetadataMixin,
@@ -294,7 +298,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
         migrations.AddField(
             model_name="program2021pointpage",