Merge pull request #326 from danesjenovdan/v3-dev

Pulling refs/heads/v3-dev into v3-k8s

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# black formatting
+39bd9ed359aae7880996fbe692a4c655dc580fd7
+# isort formatting
+c71011a65784b4f682e7ae0ebe82ebc853f05a49
+# some reformatting
+4284a54d596429714909bc31a1e304d22a0b06c4

.github/workflows/check_formatting.yaml

@@ -0,0 +1,29 @@
+name: Check formatting
+on:
+  push:
+    branches:
+      - "v3-dev"
+jobs:
+  check_python_formatting:
+    name: Check Python formatting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          pip install black isort
+
+      - name: Check formatting with black
+        run: |
+          (cd ./djnd && black . --check --diff)
+
+      - name: Check formatting with isort
+        run: |
+          (cd ./djnd && isort . --check --diff --profile black)

.vscode/extensions.json

@@ -2,6 +2,10 @@
   "recommendations": [
     "bradlc.vscode-tailwindcss",
     "csstools.postcss",
-    "jacobcassidy.css-nesting-syntax-highlighting"
+    "jacobcassidy.css-nesting-syntax-highlighting",
+    "ms-python.black-formatter",
+    "ms-python.isort",
+    "ms-python.python",
+    "ms-python.vscode-pylance"
   ]
 }

.vscode/settings.json

@@ -2,5 +2,16 @@
   "editor.tabSize": 2,
   "files.associations": {
     "*.css": "tailwindcss"
-  }
+  },
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit"
+    },
+    "editor.rulers": [88],
+    "editor.tabSize": 4,
+    "editor.insertSpaces": true
+  },
+  "isort.args": ["--profile", "black"]
 }

djnd/djnd/settings/production.py

@@ -16,10 +16,18 @@
     AWS_ACCESS_KEY_ID = os.getenv("DJANGO_AWS_ACCESS_KEY_ID", "<TODO>")
     AWS_SECRET_ACCESS_KEY = os.getenv("DJANGO_AWS_SECRET_ACCESS_KEY", "<TODO>")
     AWS_STORAGE_BUCKET_NAME = os.getenv("DJANGO_AWS_STORAGE_BUCKET_NAME", "djnd")
-    AWS_DEFAULT_ACL = "public-read"  # if files are not public they won't show up for end users
-    AWS_QUERYSTRING_AUTH = False  # query strings expire and don't play nice with the cache
+    AWS_DEFAULT_ACL = (
+        "public-read"  # if files are not public they won't show up for end users
+    )
+    AWS_QUERYSTRING_AUTH = (
+        False  # query strings expire and don't play nice with the cache
+    )
     AWS_LOCATION = os.getenv("DJANGO_AWS_LOCATION", "danesjenovdan")
     AWS_S3_REGION_NAME = os.getenv("DJANGO_AWS_REGION_NAME", "fr-par")
-    AWS_S3_ENDPOINT_URL = os.getenv("DJANGO_AWS_S3_ENDPOINT_URL", "https://s3.fr-par.scw.cloud")
+    AWS_S3_ENDPOINT_URL = os.getenv(
+        "DJANGO_AWS_S3_ENDPOINT_URL", "https://s3.fr-par.scw.cloud"
+    )
     AWS_S3_SIGNATURE_VERSION = os.getenv("DJANGO_AWS_S3_SIGNATURE_VERSION", "s3v4")
-    AWS_S3_FILE_OVERWRITE = False  # don't overwrite files if uploaded with same file name
+    AWS_S3_FILE_OVERWRITE = (
+        False  # don't overwrite files if uploaded with same file name
+    )

djnd/djnd/urls.py

@@ -4,11 +4,12 @@
 from django.templatetags.static import static
 from django.urls import include, path, re_path
 from django.views.generic.base import RedirectView
-from home.views import AgrumentByDateRedirectView
 from wagtail import urls as wagtail_urls
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.documents import urls as wagtaildocs_urls
 
+from home.views import AgrumentByDateRedirectView
+
 urlpatterns = [
     path("favicon.ico", RedirectView.as_view(url=static("favicons/favicon.ico"))),
     path("django-admin/", admin.site.urls),

djnd/home/management/commands/import_agruments.py

@@ -6,10 +6,11 @@
 from django.db import transaction
 from django.utils.formats import date_format
 from django.utils.text import slugify
-from home.models import Activity, ActivityCategory, BlogListingPage, BlogPage
 from wagtail.blocks.stream_block import StreamValue
 from wagtail.models import Locale, Page, Site
 
+from home.models import Activity, ActivityCategory, BlogListingPage, BlogPage
+
 from ._save_image import get_image, save_image
 
 

djnd/home/management/commands/import_appearances.py

@@ -3,9 +3,10 @@
 import requests
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
-from home.models import Activity, ActivityCategory
 from wagtail.models import Locale
 
+from home.models import Activity, ActivityCategory
+
 from ._save_image import save_image
 
 

djnd/home/management/commands/import_projects.py

@@ -3,9 +3,10 @@
 import requests
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
-from home.models import Activity, ActivityCategory
 from wagtail.models import Locale
 
+from home.models import Activity, ActivityCategory
+
 from ._save_image import save_image
 
 

djnd/home/management/commands/import_videos.py

@@ -3,9 +3,10 @@
 import requests
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
-from home.models import Activity, ActivityCategory
 from wagtail.models import Locale
 
+from home.models import Activity, ActivityCategory
+
 from ._save_image import save_image
 
 
@@ -79,9 +80,7 @@ def handle(self, *args, **options):
         self.stdout.write(self.style.SUCCESS("Start importing videos..."))
 
         url = "https://djnapi.djnd.si/djnd.si/videos/?lang=sl&ordering=date&size=50"
-        url_en = (
-            "https://djnapi.djnd.si/djnd.si/videos/?lang=en&ordering=date&size=50"
-        )
+        url_en = "https://djnapi.djnd.si/djnd.si/videos/?lang=en&ordering=date&size=50"
 
         try:
             category = self._get_category()

djnd/home/management/commands/translate_team_members.py

@@ -3,9 +3,10 @@
 import requests
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
-from home.models import TeamMember, TeamMemberCategory
 from wagtail.models import Locale
 
+from home.models import TeamMember, TeamMemberCategory
+
 
 class Command(BaseCommand):
     help = "Make translations of all team member snippets"

djnd/home/migrations/0003_blogpage_modularpage_newsletterpage_pillarpage.py

@@ -1,55 +1,95 @@
 # Generated by Django 4.2.10 on 2024-02-14 09:13
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('wagtailcore', '0089_log_entry_data_json_null_to_object'),
-        ('home', '0002_create_homepage'),
+        ("wagtailcore", "0089_log_entry_data_json_null_to_object"),
+        ("home", "0002_create_homepage"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='BlogPage',
+            name="BlogPage",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
-            name='ModularPage',
+            name="ModularPage",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
-            name='NewsletterPage',
+            name="NewsletterPage",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
-            name='PillarPage',
+            name="PillarPage",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
     ]

djnd/home/migrations/0004_pillarpage_description_pillarpage_image_and_more.py

@@ -1,43 +1,66 @@
 # Generated by Django 4.2.10 on 2024-02-14 10:40
 
-from django.db import migrations, models
 import django.db.models.deletion
 import wagtail.blocks
 import wagtail.fields
 import wagtail.images.blocks
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
-        ('home', '0003_blogpage_modularpage_newsletterpage_pillarpage'),
+        ("wagtailimages", "0025_alter_image_file_alter_rendition_file"),
+        ("home", "0003_blogpage_modularpage_newsletterpage_pillarpage"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='pillarpage',
-            name='description',
+            model_name="pillarpage",
+            name="description",
             field=models.TextField(blank=True),
         ),
         migrations.AddField(
-            model_name='pillarpage',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image'),
+            model_name="pillarpage",
+            name="image",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="+",
+                to="wagtailimages.image",
+            ),
         ),
         migrations.AddField(
-            model_name='pillarpage',
-            name='modules',
-            field=wagtail.fields.StreamField([], null=True, use_json_field=True, verbose_name='Moduli'),
+            model_name="pillarpage",
+            name="modules",
+            field=wagtail.fields.StreamField(
+                [], null=True, use_json_field=True, verbose_name="Moduli"
+            ),
         ),
         migrations.AddField(
-            model_name='pillarpage',
-            name='projects',
-            field=wagtail.fields.StreamField([('project', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.CharBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())]))], null=True, use_json_field=True),
+            model_name="pillarpage",
+            name="projects",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "project",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock()),
+                                ("description", wagtail.blocks.CharBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    )
+                ],
+                null=True,
+                use_json_field=True,
+            ),
         ),
         migrations.AddField(
-            model_name='pillarpage',
-            name='subtitle',
+            model_name="pillarpage",
+            name="subtitle",
             field=models.TextField(blank=True),
         ),
     ]