From 9a6c83023ef0e1da6eddd4ffaf597034a1d91d1a Mon Sep 17 00:00:00 2001 From: Ernesto Rico Schmidt <ernesto@helsinki.at> Date: Mon, 22 Apr 2024 17:56:54 -0400 Subject: [PATCH] style: apply isort & black to program and steering Closes # 176 --- program/management/commands/addnote.py | 16 ++----- .../management/commands/create_oidc_client.py | 8 +--- program/management/commands/createuser.py | 4 +- program/management/commands/export_showlog.py | 4 +- program/migrations/0001_initial.py | 32 ++++--------- program/migrations/0001_squashed.py | 48 +++++-------------- program/migrations/0002_auto_20210426_2345.py | 4 +- program/migrations/0003_host_is_active.py | 4 +- program/migrations/0004_auto_20220111_1806.py | 4 +- program/migrations/0004_show_is_active.py | 4 +- .../migrations/0005_programslot_is_active.py | 4 +- program/migrations/0008_auto_20220117_1721.py | 12 ++--- program/migrations/0012_auto_20180104_0005.py | 32 ++++--------- program/migrations/0013_auto_20220221_1637.py | 12 ++--- program/migrations/0014_auto_20180216_2000.py | 4 +- program/migrations/0015_auto_20180218_1111.py | 4 +- program/migrations/0017_auto_20180314_1409.py | 4 +- program/migrations/0023_auto_20230214_1934.py | 42 +++++++++++----- program/migrations/0024_auto_20230214_1945.py | 33 +++++++++---- program/migrations/0025_auto_20230326_2211.py | 22 +++++---- program/migrations/0028_auto_20220801_1713.py | 4 +- program/migrations/0030_auto_20220803_2217.py | 4 +- program/migrations/0035_auto_20220807_2312.py | 4 +- program/migrations/0036_auto_20220807_2318.py | 4 +- program/migrations/0037_auto_20220807_2321.py | 4 +- ...o_20230326_2211_0045_auto_20221021_2008.py | 7 ++- program/migrations/0051_remove_show_logo.py | 6 +-- program/migrations/0052_show_logo.py | 16 +++++-- program/migrations/0053_auto_20230411_1855.py | 14 +++--- .../0054_alter_schedule_last_date.py | 8 ++-- program/migrations/0055_auto_20230419_0015.py | 18 +++---- program/migrations/0056_auto_20230419_0017.py | 26 +++++----- program/migrations/0057_auto_20230419_0038.py | 26 +++++----- program/migrations/0058_auto_20230419_0039.py | 26 +++++----- .../0059_alter_schedule_end_time.py | 8 ++-- program/migrations/0067_image_license.py | 2 +- program/migrations/0073_alter_note_tags.py | 2 +- steering/sample_settings.py | 7 +-- steering/schema.py | 8 +--- steering/urls.py | 10 ++-- 40 files changed, 218 insertions(+), 283 deletions(-) diff --git a/program/management/commands/addnote.py b/program/management/commands/addnote.py index e19ede8d..567b30de 100644 --- a/program/management/commands/addnote.py +++ b/program/management/commands/addnote.py @@ -21,9 +21,7 @@ class Command(BaseCommand): status = args[2] index = args[3] else: - raise CommandError( - "you must provide the show_id, start_date, status [index]" - ) + raise CommandError("you must provide the show_id, start_date, status [index]") try: show = Show.objects.get(id=show_id) @@ -45,9 +43,7 @@ class Command(BaseCommand): raise CommandError(dne) except TimeSlot.MultipleObjectsReturned: if not index: - raise CommandError( - "you must provide the show_id, start_date, status index" - ) + raise CommandError("you must provide the show_id, start_date, status index") try: timeslot = TimeSlot.objects.filter( show=show, start__year=year, start__month=month, start__day=day @@ -61,9 +57,7 @@ class Command(BaseCommand): except Exception as e: raise CommandError(e) - note = Note( - timeslot=timeslot, title=title, content="".join(lines), status=status - ) + note = Note(timeslot=timeslot, title=title, content="".join(lines), status=status) try: note.validate_unique() @@ -71,6 +65,4 @@ class Command(BaseCommand): raise CommandError(ve.messages[0]) else: note.save() - self.stdout.write( - self.style.SUCCESS, f'added note "{title}" to "{timeslot}"' - ) + self.stdout.write(self.style.SUCCESS, f'added note "{title}" to "{timeslot}"') diff --git a/program/management/commands/create_oidc_client.py b/program/management/commands/create_oidc_client.py index b7c247da..29d69044 100644 --- a/program/management/commands/create_oidc_client.py +++ b/program/management/commands/create_oidc_client.py @@ -14,9 +14,7 @@ class Command(BaseCommand): ) def add_arguments(self, parser): - parser.add_argument( - "name", type=str, help="A label that you associate with this client" - ) + parser.add_argument("name", type=str, help="A label that you associate with this client") parser.add_argument( "client_type", type=str, @@ -176,9 +174,7 @@ class Command(BaseCommand): else: self.stdout.write(f"{c.client_id}") else: - self.stdout.write( - f"Successfully created new OIDC client, with ID: {c.client_id}" - ) + self.stdout.write(f"Successfully created new OIDC client, with ID: {c.client_id}") if options["client_type"] == "confidential": self.stdout.write( f"The secret for this confidential client is: {c.client_secret}" diff --git a/program/management/commands/createuser.py b/program/management/commands/createuser.py index 3e816ccd..6f2c603b 100644 --- a/program/management/commands/createuser.py +++ b/program/management/commands/createuser.py @@ -33,6 +33,4 @@ class Command(BaseCommand): User.objects.create_user(username=username, email=email) self.stdout.write(self.style.SUCCESS("user created successfully.")) else: - self.stdout.write( - self.style.NOTICE("User already exists, no need to create.") - ) + self.stdout.write(self.style.NOTICE("User already exists, no need to create.")) diff --git a/program/management/commands/export_showlog.py b/program/management/commands/export_showlog.py index df471d48..3ed6dbeb 100644 --- a/program/management/commands/export_showlog.py +++ b/program/management/commands/export_showlog.py @@ -39,9 +39,7 @@ class Command(BaseCommand): if currentDate: self.stdout.write("\n") currentDate = ts.start.date() - self.stdout.write( - self.style.NOTICE, currentDate.strftime("## %a %d.%m.%Y:\n") - ) + self.stdout.write(self.style.NOTICE, currentDate.strftime("## %a %d.%m.%Y:\n")) title = ts.show.name if ts.schedule.is_repetition: diff --git a/program/migrations/0001_initial.py b/program/migrations/0001_initial.py index 34b3079b..914fbebe 100644 --- a/program/migrations/0001_initial.py +++ b/program/migrations/0001_initial.py @@ -31,15 +31,11 @@ class Migration(migrations.Migration): ), ( "color", - models.CharField( - default=b"#ffffff", max_length=7, verbose_name="Color" - ), + models.CharField(default=b"#ffffff", max_length=7, verbose_name="Color"), ), ( "text_color", - models.CharField( - default=b"#000000", max_length=7, verbose_name="Text color" - ), + models.CharField(default=b"#000000", max_length=7, verbose_name="Text color"), ), ("enabled", models.BooleanField(default=True, verbose_name="Enabled")), ], @@ -64,9 +60,7 @@ class Migration(migrations.Migration): ("name", models.CharField(max_length=128, verbose_name="Name")), ( "email", - models.EmailField( - max_length=254, verbose_name="E-Mail", blank=True - ), + models.EmailField(max_length=254, verbose_name="E-Mail", blank=True), ), ("website", models.URLField(verbose_name="Website", blank=True)), ], @@ -91,9 +85,7 @@ class Migration(migrations.Migration): ("focus", models.CharField(max_length=32, verbose_name="Focus")), ( "abbrev", - models.CharField( - unique=True, max_length=4, verbose_name="Abbreviation" - ), + models.CharField(unique=True, max_length=4, verbose_name="Abbreviation"), ), ( "slug", @@ -161,9 +153,7 @@ class Migration(migrations.Migration): ), ( "cba_entry_id", - models.IntegerField( - null=True, verbose_name="CBA entry ID", blank=True - ), + models.IntegerField(null=True, verbose_name="CBA entry ID", blank=True), ), ("start", models.DateTimeField(editable=False)), ("created", models.DateTimeField(auto_now_add=True)), @@ -326,9 +316,7 @@ class Migration(migrations.Migration): ), ( "cba_series_id", - models.IntegerField( - null=True, verbose_name="CBA series ID", blank=True - ), + models.IntegerField(null=True, verbose_name="CBA series ID", blank=True), ), ( "automation_id", @@ -410,9 +398,7 @@ class Migration(migrations.Migration): ), ( "abbrev", - models.CharField( - unique=True, max_length=4, verbose_name="Abbreviation" - ), + models.CharField(unique=True, max_length=4, verbose_name="Abbreviation"), ), ( "slug", @@ -467,9 +453,7 @@ class Migration(migrations.Migration): ("topic", models.CharField(max_length=32, verbose_name="Show topic")), ( "abbrev", - models.CharField( - unique=True, max_length=4, verbose_name="Abbreviation" - ), + models.CharField(unique=True, max_length=4, verbose_name="Abbreviation"), ), ( "slug", diff --git a/program/migrations/0001_squashed.py b/program/migrations/0001_squashed.py index 4a3a39fe..41e7e026 100644 --- a/program/migrations/0001_squashed.py +++ b/program/migrations/0001_squashed.py @@ -56,9 +56,7 @@ class Migration(migrations.Migration): ("name", models.CharField(max_length=128, verbose_name="Name")), ( "email", - models.EmailField( - blank=True, max_length=254, verbose_name="E-Mail" - ), + models.EmailField(blank=True, max_length=254, verbose_name="E-Mail"), ), ( "website", @@ -201,9 +199,7 @@ class Migration(migrations.Migration): ("focus", models.CharField(max_length=32, verbose_name="Focus")), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", @@ -432,9 +428,7 @@ class Migration(migrations.Migration): ), ( "fallback_id", - models.IntegerField( - blank=True, null=True, verbose_name="Fallback ID" - ), + models.IntegerField(blank=True, null=True, verbose_name="Fallback ID"), ), ( "height", @@ -533,9 +527,7 @@ class Migration(migrations.Migration): ("category", models.CharField(max_length=32, verbose_name="Category")), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", @@ -648,15 +640,11 @@ class Migration(migrations.Migration): ), ( "fallback_id", - models.IntegerField( - blank=True, null=True, verbose_name="Fallback ID" - ), + models.IntegerField(blank=True, null=True, verbose_name="Fallback ID"), ), ( "automation_id", - models.IntegerField( - blank=True, null=True, verbose_name="Automation ID" - ), + models.IntegerField(blank=True, null=True, verbose_name="Automation ID"), ), ("created", models.DateTimeField(auto_now_add=True, null=True)), ("last_updated", models.DateTimeField(auto_now=True, null=True)), @@ -680,9 +668,7 @@ class Migration(migrations.Migration): ), ( "add_business_days_only", - models.BooleanField( - default=False, verbose_name="Only add business days?" - ), + models.BooleanField(default=False, verbose_name="Only add business days?"), ), ( "add_days_no", @@ -710,9 +696,7 @@ class Migration(migrations.Migration): ("topic", models.CharField(max_length=32, verbose_name="Topic")), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", @@ -775,15 +759,11 @@ class Migration(migrations.Migration): ), ( "color", - models.CharField( - default="#ffffff", max_length=7, verbose_name="Color" - ), + models.CharField(default="#ffffff", max_length=7, verbose_name="Color"), ), ( "text_color", - models.CharField( - default="#000000", max_length=7, verbose_name="Text color" - ), + models.CharField(default="#000000", max_length=7, verbose_name="Text color"), ), ( "is_active", @@ -1040,9 +1020,7 @@ class Migration(migrations.Migration): ), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", @@ -1062,9 +1040,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="timeslot", name="note_id", - field=models.IntegerField( - editable=False, null=True, verbose_name="Note ID" - ), + field=models.IntegerField(editable=False, null=True, verbose_name="Note ID"), ), migrations.AlterField( model_name="timeslot", diff --git a/program/migrations/0002_auto_20210426_2345.py b/program/migrations/0002_auto_20210426_2345.py index 12d9e83f..8c16f95e 100644 --- a/program/migrations/0002_auto_20210426_2345.py +++ b/program/migrations/0002_auto_20210426_2345.py @@ -13,7 +13,5 @@ class Migration(migrations.Migration): migrations.RenameField( model_name="schedule", old_name="fallback_id", new_name="default_id" ), - migrations.RenameField( - model_name="show", old_name="fallback_id", new_name="default_id" - ), + migrations.RenameField(model_name="show", old_name="fallback_id", new_name="default_id"), ] diff --git a/program/migrations/0003_host_is_active.py b/program/migrations/0003_host_is_active.py index ef977a88..686d3ac5 100644 --- a/program/migrations/0003_host_is_active.py +++ b/program/migrations/0003_host_is_active.py @@ -14,8 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name="host", name="is_active", - field=models.BooleanField( - default=True, verbose_name="Is active", editable=False - ), + field=models.BooleanField(default=True, verbose_name="Is active", editable=False), ), ] diff --git a/program/migrations/0004_auto_20220111_1806.py b/program/migrations/0004_auto_20220111_1806.py index 17cf8ad1..a5c83746 100644 --- a/program/migrations/0004_auto_20220111_1806.py +++ b/program/migrations/0004_auto_20220111_1806.py @@ -59,9 +59,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="schedule", name="default_playlist_id", - field=models.IntegerField( - blank=True, null=True, verbose_name="Default Playlist ID" - ), + field=models.IntegerField(blank=True, null=True, verbose_name="Default Playlist ID"), ), migrations.AlterField( model_name="show", diff --git a/program/migrations/0004_show_is_active.py b/program/migrations/0004_show_is_active.py index 2d27dcae..310ba7f6 100644 --- a/program/migrations/0004_show_is_active.py +++ b/program/migrations/0004_show_is_active.py @@ -14,8 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name="show", name="is_active", - field=models.BooleanField( - default=True, verbose_name="Is active", editable=False - ), + field=models.BooleanField(default=True, verbose_name="Is active", editable=False), ), ] diff --git a/program/migrations/0005_programslot_is_active.py b/program/migrations/0005_programslot_is_active.py index 04ca314a..1a532fba 100644 --- a/program/migrations/0005_programslot_is_active.py +++ b/program/migrations/0005_programslot_is_active.py @@ -14,8 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name="programslot", name="is_active", - field=models.BooleanField( - default=True, verbose_name="Is active", editable=False - ), + field=models.BooleanField(default=True, verbose_name="Is active", editable=False), ), ] diff --git a/program/migrations/0008_auto_20220117_1721.py b/program/migrations/0008_auto_20220117_1721.py index 6009f039..6547477f 100644 --- a/program/migrations/0008_auto_20220117_1721.py +++ b/program/migrations/0008_auto_20220117_1721.py @@ -109,16 +109,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="show", name="cba_series_id", - field=models.IntegerField( - blank=True, null=True, verbose_name="CBA Series ID" - ), + field=models.IntegerField(blank=True, null=True, verbose_name="CBA Series ID"), ), migrations.AlterField( model_name="show", name="default_playlist_id", - field=models.IntegerField( - blank=True, null=True, verbose_name="Default Playlist ID" - ), + field=models.IntegerField(blank=True, null=True, verbose_name="Default Playlist ID"), ), migrations.AlterField( model_name="show", @@ -128,9 +124,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="show", name="email", - field=models.EmailField( - blank=True, max_length=254, null=True, verbose_name="E-Mail" - ), + field=models.EmailField(blank=True, max_length=254, null=True, verbose_name="E-Mail"), ), migrations.AlterField( model_name="show", diff --git a/program/migrations/0012_auto_20180104_0005.py b/program/migrations/0012_auto_20180104_0005.py index a1b9dd1a..9c20f6d7 100644 --- a/program/migrations/0012_auto_20180104_0005.py +++ b/program/migrations/0012_auto_20180104_0005.py @@ -32,9 +32,7 @@ class Migration(migrations.Migration): ("category", models.CharField(max_length=32, verbose_name="Category")), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", @@ -120,9 +118,7 @@ class Migration(migrations.Migration): ), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", @@ -172,15 +168,11 @@ class Migration(migrations.Migration): ), ( "fallback_id", - models.IntegerField( - blank=True, null=True, verbose_name="Fallback ID" - ), + models.IntegerField(blank=True, null=True, verbose_name="Fallback ID"), ), ( "automation_id", - models.IntegerField( - blank=True, null=True, verbose_name="Automation ID" - ), + models.IntegerField(blank=True, null=True, verbose_name="Automation ID"), ), ("created", models.DateTimeField(auto_now_add=True, null=True)), ("last_updated", models.DateTimeField(auto_now=True, null=True)), @@ -206,9 +198,7 @@ class Migration(migrations.Migration): ("topic", models.CharField(max_length=32, verbose_name="Topic")), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", @@ -267,15 +257,11 @@ class Migration(migrations.Migration): ), ( "color", - models.CharField( - default="#ffffff", max_length=7, verbose_name="Color" - ), + models.CharField(default="#ffffff", max_length=7, verbose_name="Color"), ), ( "text_color", - models.CharField( - default="#000000", max_length=7, verbose_name="Text color" - ), + models.CharField(default="#000000", max_length=7, verbose_name="Text color"), ), ("enabled", models.BooleanField(default=True, verbose_name="Enabled")), ], @@ -553,9 +539,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="show", name="fallback_id", - field=models.IntegerField( - blank=True, null=True, verbose_name="Fallback ID" - ), + field=models.IntegerField(blank=True, null=True, verbose_name="Fallback ID"), ), migrations.AddField( model_name="show", diff --git a/program/migrations/0013_auto_20220221_1637.py b/program/migrations/0013_auto_20220221_1637.py index dbd6cb51..7da4d780 100644 --- a/program/migrations/0013_auto_20220221_1637.py +++ b/program/migrations/0013_auto_20220221_1637.py @@ -352,9 +352,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="show", name="category", - field=models.ManyToManyField( - blank=True, related_name="shows", to="program.Category" - ), + field=models.ManyToManyField(blank=True, related_name="shows", to="program.Category"), ), migrations.AlterField( model_name="show", @@ -395,9 +393,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="show", name="hosts", - field=models.ManyToManyField( - blank=True, related_name="shows", to="program.Host" - ), + field=models.ManyToManyField(blank=True, related_name="shows", to="program.Host"), ), migrations.AlterField( model_name="show", @@ -482,9 +478,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="show", name="topic", - field=models.ManyToManyField( - blank=True, related_name="shows", to="program.Topic" - ), + field=models.ManyToManyField(blank=True, related_name="shows", to="program.Topic"), ), migrations.AlterField( model_name="show", diff --git a/program/migrations/0014_auto_20180216_2000.py b/program/migrations/0014_auto_20180216_2000.py index 6329c3f1..81c0ae05 100644 --- a/program/migrations/0014_auto_20180216_2000.py +++ b/program/migrations/0014_auto_20180216_2000.py @@ -31,9 +31,7 @@ class Migration(migrations.Migration): ), ( "abbrev", - models.CharField( - max_length=4, unique=True, verbose_name="Abbreviation" - ), + models.CharField(max_length=4, unique=True, verbose_name="Abbreviation"), ), ( "slug", diff --git a/program/migrations/0015_auto_20180218_1111.py b/program/migrations/0015_auto_20180218_1111.py index e0dacaee..99303d10 100644 --- a/program/migrations/0015_auto_20180218_1111.py +++ b/program/migrations/0015_auto_20180218_1111.py @@ -15,9 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="timeslot", name="note_id", - field=models.IntegerField( - editable=False, null=True, verbose_name="Note ID" - ), + field=models.IntegerField(editable=False, null=True, verbose_name="Note ID"), ), migrations.AlterField( model_name="timeslot", diff --git a/program/migrations/0017_auto_20180314_1409.py b/program/migrations/0017_auto_20180314_1409.py index e8ca67d9..0d6780d2 100644 --- a/program/migrations/0017_auto_20180314_1409.py +++ b/program/migrations/0017_auto_20180314_1409.py @@ -15,9 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="schedule", name="add_business_days_only", - field=models.BooleanField( - default=False, verbose_name="Only add business days?" - ), + field=models.BooleanField(default=False, verbose_name="Only add business days?"), ), migrations.AddField( model_name="schedule", diff --git a/program/migrations/0023_auto_20230214_1934.py b/program/migrations/0023_auto_20230214_1934.py index bea7625b..30e6ddab 100644 --- a/program/migrations/0023_auto_20230214_1934.py +++ b/program/migrations/0023_auto_20230214_1934.py @@ -6,27 +6,45 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0022_auto_20220516_2245'), + ("program", "0022_auto_20220516_2245"), ] operations = [ migrations.AddField( - model_name='rrule', - name='by_weekdays', - field=models.CharField(blank=True, choices=[(None, ''), ('0,1,2,3,4', 'business days'), ('5,6', 'weekends')], max_length=9, null=True), + model_name="rrule", + name="by_weekdays", + field=models.CharField( + blank=True, + choices=[(None, ""), ("0,1,2,3,4", "business days"), ("5,6", "weekends")], + max_length=9, + null=True, + ), ), migrations.AlterField( - model_name='rrule', - name='by_set_pos', - field=models.IntegerField(blank=True, choices=[(1, 'first'), (2, 'second'), (3, 'third'), (4, 'fourth'), (5, 'fifth'), (-1, 'last')], null=True), + model_name="rrule", + name="by_set_pos", + field=models.IntegerField( + blank=True, + choices=[ + (1, "first"), + (2, "second"), + (3, "third"), + (4, "fourth"), + (5, "fifth"), + (-1, "last"), + ], + null=True, + ), ), migrations.AlterField( - model_name='rrule', - name='freq', - field=models.IntegerField(choices=[(0, 'once'), (1, 'monthly'), (2, 'weekly'), (3, 'daily')]), + model_name="rrule", + name="freq", + field=models.IntegerField( + choices=[(0, "once"), (1, "monthly"), (2, "weekly"), (3, "daily")] + ), ), migrations.AlterUniqueTogether( - name='rrule', - unique_together={('freq', 'interval', 'by_set_pos', 'by_weekdays')}, + name="rrule", + unique_together={("freq", "interval", "by_set_pos", "by_weekdays")}, ), ] diff --git a/program/migrations/0024_auto_20230214_1945.py b/program/migrations/0024_auto_20230214_1945.py index 27cdc2fd..7580c5c6 100644 --- a/program/migrations/0024_auto_20230214_1945.py +++ b/program/migrations/0024_auto_20230214_1945.py @@ -1,24 +1,41 @@ # Generated by Django 3.2.17 on 2023-02-14 18:45 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0023_auto_20230214_1934'), + ("program", "0023_auto_20230214_1934"), ] operations = [ migrations.AlterField( - model_name='schedule', - name='by_weekday', - field=models.IntegerField(choices=[(0, 'Monday'), (1, 'Tuesday'), (2, 'Wednesday'), (3, 'Thursday'), (4, 'Friday'), (5, 'Saturday'), (6, 'Sunday')], help_text='Number of the Weekday.', null=True), + model_name="schedule", + name="by_weekday", + field=models.IntegerField( + choices=[ + (0, "Monday"), + (1, "Tuesday"), + (2, "Wednesday"), + (3, "Thursday"), + (4, "Friday"), + (5, "Saturday"), + (6, "Sunday"), + ], + help_text="Number of the Weekday.", + null=True, + ), ), migrations.AlterField( - model_name='schedule', - name='rrule', - field=models.ForeignKey(help_text='A recurrence rule.', on_delete=django.db.models.deletion.CASCADE, related_name='schedules', to='program.rrule'), + model_name="schedule", + name="rrule", + field=models.ForeignKey( + help_text="A recurrence rule.", + on_delete=django.db.models.deletion.CASCADE, + related_name="schedules", + to="program.rrule", + ), ), ] diff --git a/program/migrations/0025_auto_20230326_2211.py b/program/migrations/0025_auto_20230326_2211.py index 47eddb83..6bda0edc 100644 --- a/program/migrations/0025_auto_20230326_2211.py +++ b/program/migrations/0025_auto_20230326_2211.py @@ -6,22 +6,26 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0024_auto_20230214_1945'), + ("program", "0024_auto_20230214_1945"), ] operations = [ migrations.AlterModelOptions( - name='rrule', - options={'ordering': ('pk',), 'verbose_name': 'recurrence rule'}, + name="rrule", + options={"ordering": ("pk",), "verbose_name": "recurrence rule"}, ), migrations.AlterField( - model_name='rrule', - name='count', - field=models.IntegerField(blank=True, help_text='How many occurrences should be generated.', null=True), + model_name="rrule", + name="count", + field=models.IntegerField( + blank=True, help_text="How many occurrences should be generated.", null=True + ), ), migrations.AlterField( - model_name='rrule', - name='interval', - field=models.IntegerField(default=1, help_text='The interval between each freq iteration.'), + model_name="rrule", + name="interval", + field=models.IntegerField( + default=1, help_text="The interval between each freq iteration." + ), ), ] diff --git a/program/migrations/0028_auto_20220801_1713.py b/program/migrations/0028_auto_20220801_1713.py index 05c1f1fe..26d40e4e 100644 --- a/program/migrations/0028_auto_20220801_1713.py +++ b/program/migrations/0028_auto_20220801_1713.py @@ -17,8 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="show", name="language", - field=models.ManyToManyField( - blank=True, related_name="shows", to="program.Language" - ), + field=models.ManyToManyField(blank=True, related_name="shows", to="program.Language"), ), ] diff --git a/program/migrations/0030_auto_20220803_2217.py b/program/migrations/0030_auto_20220803_2217.py index 83d3cf96..4f9d18bc 100644 --- a/program/migrations/0030_auto_20220803_2217.py +++ b/program/migrations/0030_auto_20220803_2217.py @@ -13,9 +13,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="note", name="contributors", - field=models.ManyToManyField( - related_name="contributions", to="program.Host" - ), + field=models.ManyToManyField(related_name="contributions", to="program.Host"), ), migrations.AddField( model_name="note", diff --git a/program/migrations/0035_auto_20220807_2312.py b/program/migrations/0035_auto_20220807_2312.py index b7caec3a..ac5d7516 100644 --- a/program/migrations/0035_auto_20220807_2312.py +++ b/program/migrations/0035_auto_20220807_2312.py @@ -14,9 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="host", name="created_at", - field=models.DateTimeField( - auto_now_add=True, default=django.utils.timezone.now - ), + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), preserve_default=False, ), migrations.AddField( diff --git a/program/migrations/0036_auto_20220807_2318.py b/program/migrations/0036_auto_20220807_2318.py index 9070d28c..ae9e469d 100644 --- a/program/migrations/0036_auto_20220807_2318.py +++ b/program/migrations/0036_auto_20220807_2318.py @@ -14,9 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="show", name="created_at", - field=models.DateTimeField( - auto_now_add=True, default=django.utils.timezone.now - ), + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), preserve_default=False, ), migrations.AddField( diff --git a/program/migrations/0037_auto_20220807_2321.py b/program/migrations/0037_auto_20220807_2321.py index dafff82f..c81dbcf8 100644 --- a/program/migrations/0037_auto_20220807_2321.py +++ b/program/migrations/0037_auto_20220807_2321.py @@ -14,9 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="note", name="created_at", - field=models.DateTimeField( - auto_now_add=True, default=django.utils.timezone.now - ), + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), preserve_default=False, ), migrations.AddField( diff --git a/program/migrations/0046_merge_0025_auto_20230326_2211_0045_auto_20221021_2008.py b/program/migrations/0046_merge_0025_auto_20230326_2211_0045_auto_20221021_2008.py index 68c0513f..059e256c 100644 --- a/program/migrations/0046_merge_0025_auto_20230326_2211_0045_auto_20221021_2008.py +++ b/program/migrations/0046_merge_0025_auto_20230326_2211_0045_auto_20221021_2008.py @@ -6,9 +6,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('program', '0025_auto_20230326_2211'), - ('program', '0045_auto_20221021_2008'), + ("program", "0025_auto_20230326_2211"), + ("program", "0045_auto_20221021_2008"), ] - operations = [ - ] + operations = [] diff --git a/program/migrations/0051_remove_show_logo.py b/program/migrations/0051_remove_show_logo.py index 9130f374..6029c31b 100644 --- a/program/migrations/0051_remove_show_logo.py +++ b/program/migrations/0051_remove_show_logo.py @@ -6,12 +6,12 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('program', '0050_auto_20230404_0037'), + ("program", "0050_auto_20230404_0037"), ] operations = [ migrations.RemoveField( - model_name='show', - name='logo', + model_name="show", + name="logo", ), ] diff --git a/program/migrations/0052_show_logo.py b/program/migrations/0052_show_logo.py index ba7a4c67..6fd24cfb 100644 --- a/program/migrations/0052_show_logo.py +++ b/program/migrations/0052_show_logo.py @@ -1,19 +1,25 @@ # Generated by Django 3.2.18 on 2023-04-11 15:46 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0051_remove_show_logo'), + ("program", "0051_remove_show_logo"), ] operations = [ migrations.AddField( - model_name='show', - name='logo', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='logo_shows', to='program.image'), + model_name="show", + name="logo", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="logo_shows", + to="program.image", + ), ), ] diff --git a/program/migrations/0053_auto_20230411_1855.py b/program/migrations/0053_auto_20230411_1855.py index 6a9ad1de..d9b701bd 100644 --- a/program/migrations/0053_auto_20230411_1855.py +++ b/program/migrations/0053_auto_20230411_1855.py @@ -6,18 +6,18 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0052_show_logo'), + ("program", "0052_show_logo"), ] operations = [ migrations.AlterField( - model_name='image', - name='alt_text', - field=models.TextField(blank=True, default=''), + model_name="image", + name="alt_text", + field=models.TextField(blank=True, default=""), ), migrations.AlterField( - model_name='image', - name='credits', - field=models.TextField(blank=True, default=''), + model_name="image", + name="credits", + field=models.TextField(blank=True, default=""), ), ] diff --git a/program/migrations/0054_alter_schedule_last_date.py b/program/migrations/0054_alter_schedule_last_date.py index 1e6b9a40..c7818aa7 100644 --- a/program/migrations/0054_alter_schedule_last_date.py +++ b/program/migrations/0054_alter_schedule_last_date.py @@ -6,13 +6,13 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0053_auto_20230411_1855'), + ("program", "0053_auto_20230411_1855"), ] operations = [ migrations.AlterField( - model_name='schedule', - name='last_date', - field=models.DateField(help_text='End date of schedule.', null=True), + model_name="schedule", + name="last_date", + field=models.DateField(help_text="End date of schedule.", null=True), ), ] diff --git a/program/migrations/0055_auto_20230419_0015.py b/program/migrations/0055_auto_20230419_0015.py index 35487393..96e5d188 100644 --- a/program/migrations/0055_auto_20230419_0015.py +++ b/program/migrations/0055_auto_20230419_0015.py @@ -6,24 +6,24 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('program', '0054_alter_schedule_last_date'), + ("program", "0054_alter_schedule_last_date"), ] operations = [ migrations.RemoveField( - model_name='host', - name='updated_by', + model_name="host", + name="updated_by", ), migrations.RemoveField( - model_name='note', - name='updated_by', + model_name="note", + name="updated_by", ), migrations.RemoveField( - model_name='show', - name='updated_by', + model_name="show", + name="updated_by", ), migrations.RemoveField( - model_name='userprofile', - name='updated_by', + model_name="userprofile", + name="updated_by", ), ] diff --git a/program/migrations/0056_auto_20230419_0017.py b/program/migrations/0056_auto_20230419_0017.py index 82cf8c58..f0177b60 100644 --- a/program/migrations/0056_auto_20230419_0017.py +++ b/program/migrations/0056_auto_20230419_0017.py @@ -6,28 +6,28 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0055_auto_20230419_0015'), + ("program", "0055_auto_20230419_0015"), ] operations = [ migrations.AddField( - model_name='host', - name='updated_by', - field=models.CharField(blank=True, default='', max_length=150), + model_name="host", + name="updated_by", + field=models.CharField(blank=True, default="", max_length=150), ), migrations.AddField( - model_name='note', - name='updated_by', - field=models.CharField(blank=True, default='', max_length=150), + model_name="note", + name="updated_by", + field=models.CharField(blank=True, default="", max_length=150), ), migrations.AddField( - model_name='show', - name='updated_by', - field=models.CharField(blank=True, default='', max_length=150), + model_name="show", + name="updated_by", + field=models.CharField(blank=True, default="", max_length=150), ), migrations.AddField( - model_name='userprofile', - name='updated_by', - field=models.CharField(blank=True, default='', max_length=150), + model_name="userprofile", + name="updated_by", + field=models.CharField(blank=True, default="", max_length=150), ), ] diff --git a/program/migrations/0057_auto_20230419_0038.py b/program/migrations/0057_auto_20230419_0038.py index c4c62a1d..5bf2a917 100644 --- a/program/migrations/0057_auto_20230419_0038.py +++ b/program/migrations/0057_auto_20230419_0038.py @@ -6,32 +6,32 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('program', '0056_auto_20230419_0017'), + ("program", "0056_auto_20230419_0017"), ] operations = [ migrations.RemoveField( - model_name='category', - name='subtitle', + model_name="category", + name="subtitle", ), migrations.RemoveField( - model_name='host', - name='biography', + model_name="host", + name="biography", ), migrations.RemoveField( - model_name='note', - name='playlist', + model_name="note", + name="playlist", ), migrations.RemoveField( - model_name='note', - name='tags', + model_name="note", + name="tags", ), migrations.RemoveField( - model_name='show', - name='description', + model_name="show", + name="description", ), migrations.RemoveField( - model_name='show', - name='internal_note', + model_name="show", + name="internal_note", ), ] diff --git a/program/migrations/0058_auto_20230419_0039.py b/program/migrations/0058_auto_20230419_0039.py index 117cfbc5..214811fc 100644 --- a/program/migrations/0058_auto_20230419_0039.py +++ b/program/migrations/0058_auto_20230419_0039.py @@ -6,38 +6,38 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0057_auto_20230419_0038'), + ("program", "0057_auto_20230419_0038"), ] operations = [ migrations.AddField( - model_name='category', - name='subtitle', + model_name="category", + name="subtitle", field=models.TextField(blank=True), ), migrations.AddField( - model_name='host', - name='biography', + model_name="host", + name="biography", field=models.TextField(blank=True), ), migrations.AddField( - model_name='note', - name='playlist', + model_name="note", + name="playlist", field=models.TextField(blank=True), ), migrations.AddField( - model_name='note', - name='tags', + model_name="note", + name="tags", field=models.TextField(blank=True), ), migrations.AddField( - model_name='show', - name='description', + model_name="show", + name="description", field=models.TextField(blank=True), ), migrations.AddField( - model_name='show', - name='internal_note', + model_name="show", + name="internal_note", field=models.TextField(blank=True), ), ] diff --git a/program/migrations/0059_alter_schedule_end_time.py b/program/migrations/0059_alter_schedule_end_time.py index a0f3a1df..8978e86b 100644 --- a/program/migrations/0059_alter_schedule_end_time.py +++ b/program/migrations/0059_alter_schedule_end_time.py @@ -6,13 +6,13 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('program', '0058_auto_20230419_0039'), + ("program", "0058_auto_20230419_0039"), ] operations = [ migrations.AlterField( - model_name='schedule', - name='end_time', - field=models.TimeField(help_text='End time of schedule.', null=True), + model_name="schedule", + name="end_time", + field=models.TimeField(help_text="End time of schedule.", null=True), ), ] diff --git a/program/migrations/0067_image_license.py b/program/migrations/0067_image_license.py index 4416ef6a..f9a8d20f 100644 --- a/program/migrations/0067_image_license.py +++ b/program/migrations/0067_image_license.py @@ -1,7 +1,7 @@ # Generated by Django 4.2.2 on 2023-07-27 19:23 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/program/migrations/0073_alter_note_tags.py b/program/migrations/0073_alter_note_tags.py index fb17daec..271af88b 100644 --- a/program/migrations/0073_alter_note_tags.py +++ b/program/migrations/0073_alter_note_tags.py @@ -33,5 +33,5 @@ class Migration(migrations.Migration): migrations.RemoveField( model_name="note", name="old_tags", - ) + ), ] diff --git a/steering/sample_settings.py b/steering/sample_settings.py index 6f414bfa..5ed79771 100644 --- a/steering/sample_settings.py +++ b/steering/sample_settings.py @@ -1,10 +1,11 @@ # Advanced settings for Steering # Go to https://docs.aura.radio to learn how to configure LDAP. +# Import classes, functions, etc. +from django_auth_ldap.config import GroupOfNamesType + # import the base settings from steering.settings import * # noqa -# Import classes, functions, etc. -from django_auth_ldap.config import GroupOfNamesType # and use them to extend or overwrite settings -AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn") \ No newline at end of file +AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn") diff --git a/steering/schema.py b/steering/schema.py index 8505a547..d607d104 100644 --- a/steering/schema.py +++ b/steering/schema.py @@ -20,17 +20,13 @@ def add_enum_documentation(result, generator, request, public): from program.models import Schedule from program.serializers import SOLUTION_CHOICES - weekday_choices_desc = _generate_choices_description( - Schedule.by_weekday.field.choices - ) + weekday_choices_desc = _generate_choices_description(Schedule.by_weekday.field.choices) solutions_choices_desc = _generate_choices_description(SOLUTION_CHOICES.items()) schema = result["components"]["schemas"] schema["ByWeekdayEnum"]["description"] = weekday_choices_desc schema["SolutionChoicesEnum"]["description"] = solutions_choices_desc for item in ["ScheduleCreateUpdateRequest", "PatchedScheduleCreateUpdateRequest"]: - solutions_props = schema[item]["properties"]["solutions"][ - "additionalProperties" - ] + solutions_props = schema[item]["properties"]["solutions"]["additionalProperties"] solutions_props["description"] = solutions_choices_desc return result diff --git a/steering/urls.py b/steering/urls.py index 92baba9d..c55980cd 100644 --- a/steering/urls.py +++ b/steering/urls.py @@ -27,6 +27,7 @@ from django.contrib import admin from django.urls import include, path from program.views import ( APICategoryViewSet, + APIDayScheduleViewSet, APIFundingCategoryViewSet, APIHostViewSet, APIImageViewSet, @@ -35,6 +36,7 @@ from program.views import ( APILinkTypeViewSet, APIMusicFocusViewSet, APINoteViewSet, + APIPlayoutViewSet, APIRadioSettingsViewSet, APIRRuleViewSet, APIScheduleViewSet, @@ -43,8 +45,6 @@ from program.views import ( APITopicViewSet, APITypeViewSet, APIUserViewSet, - APIDayScheduleViewSet, - APIPlayoutViewSet ) admin.autodiscover() @@ -73,7 +73,11 @@ router.register(r"program/week", APIPlayoutViewSet, basename="program/week") urlpatterns = [ path("openid/", include("oidc_provider.urls", namespace="oidc_provider")), path("api/v1/", include(router.urls)), - path("api/v1/program/<int:year>/<int:month>/<int:day>/", APIDayScheduleViewSet.as_view({'get': 'list'}), name="program"), + path( + "api/v1/program/<int:year>/<int:month>/<int:day>/", + APIDayScheduleViewSet.as_view({"get": "list"}), + name="program", + ), path("api/v1/schema/", SpectacularAPIView.as_view(), name="schema"), path( "api/v1/schema/swagger-ui/", -- GitLab