The ruffening.

Author: valberg

src/backoffice/views/backoffice.py

@@ -23,7 +23,8 @@
 
 
 class BackofficeIndexView(CampViewMixin, RaisePermissionRequiredMixin, TemplateView):
-    """The Backoffice index view only requires camps.backoffice_permission so we use RaisePermissionRequiredMixin directly"""
+    # The Backoffice index view only requires camps.backoffice_permission so,
+    # we use RaisePermissionRequiredMixin directly
 
     permission_required = "camps.backoffice_permission"
     template_name = "index.html"

src/bornhack/environment_settings.py.dist.dev

@@ -1,4 +1,5 @@
 import os
+import sys
 
 # MODIFY THIS!
 #
@@ -22,7 +23,8 @@ DATABASES = {
         "PORT": os.getenv("POSTGRES_PORT", os.getenv("PGPORT", "5432")),
     }
 }
-DEBUG = True
+DEBUG = bool({"runserver"}.intersection(sys.argv))
+TESTING = "test" in sys.argv
 WKHTMLTOPDF_CMD = "wkhtmltopdf"
 CHANNEL_LAYERS = {}
 

src/camps/views.py

@@ -57,10 +57,12 @@ def dispatch(self, request: HttpRequest, *args: list[Any], **kwargs: dict[str, A
 
         # figure out where to redirect
         if percentpassed > settings.CAMP_REDIRECT_PERCENT or not prevcamp:
-            # either we have no previous camp, or we have both and more than settings.CAMP_REDIRECT_PERCENT has passed, so redirect to the next camp
+            # either we have no previous camp, or we have both and more than settings.CAMP_REDIRECT_PERCENT has passed,
+            # so redirect to the next camp
             camp = nextcamp
         else:
-            # either we have no next camp, or we have both and less than settings.CAMP_REDIRECT_PERCENT has passed, so redirect to the previous camp
+            # either we have no next camp, or we have both and less than settings.CAMP_REDIRECT_PERCENT has passed,
+            # so redirect to the previous camp
             camp = prevcamp
 
         # do the redirect

src/economy/views.py

@@ -459,7 +459,10 @@ def form_valid(self, form):
 
         messages.success(
             self.request,
-            f"Reimbursement {reimbursement.pk} has been created. It will be paid by the economy team to the specified bank account.",
+            (
+                f"Reimbursement {reimbursement.pk} has been created. It will be paid by the economy team to the "
+                "specified bank account."
+            ),
         )
 
         # send an email to the economy team
@@ -470,7 +473,10 @@ def form_valid(self, form):
             ),
             text_template="emails/reimbursement_created.txt",
             formatdict={"reimbursement": reimbursement},
-            subject=f"New {self.camp.title} reimbursement {reimbursement.pk} for user {reimbursement.reimbursement_user.username} created",
+            subject=(
+                f"New {self.camp.title} reimbursement {reimbursement.pk} for user "
+                f"{reimbursement.reimbursement_user.username} created"
+            ),
             to_recipients=[settings.ECONOMYTEAM_EMAIL],
         )
 

src/program/views.py

@@ -332,7 +332,7 @@ class SpeakerProposalDeleteView(
     EnsureCFPOpenMixin,
     DeleteView,
 ):
-    """This view allows a user to delete an existing SpeakerProposal object, as long as it is not linked to any EventProposals"""
+    """Allows a user to delete an existing SpeakerProposal object, as long as it is not linked to any EventProposals"""
 
     model = models.SpeakerProposal
     template_name = "proposal_delete.html"
@@ -386,7 +386,7 @@ class EventProposalTypeSelectView(
     EnsureCFPOpenMixin,
     ListView,
 ):
-    """This view is for selecting the type of event to submit (when adding a new event_proposal to an existing speaker_proposal)"""
+    """View is to select event type to submit (when adding a new event_proposal to an existing speaker_proposal)"""
 
     model = models.EventType
     template_name = "event_type_select.html"
@@ -478,7 +478,8 @@ def form_valid(self, form):
         form.instance.speakers.add(self.speaker_proposal)
         messages.success(
             self.request,
-            f"{self.speaker_proposal.name} has been added as {form.instance.event_type.host_title} for {form.instance.title}",
+            f"{self.speaker_proposal.name} has been added as "
+            f"{form.instance.event_type.host_title} for {form.instance.title}",
         )
         return redirect(self.get_success_url())
 
@@ -846,7 +847,11 @@ def form_valid(self, form):
 
         messages.success(
             self.request,
-            f"Your {self.event_type.host_title} proposal and {self.event_type.name} proposal have been submitted for review. You will receive an email when they have been accepted or rejected.",
+            (
+                f"Your {self.event_type.host_title} proposal and "
+                f"{self.event_type.name} proposal have been submitted for review. "
+                "You will receive an email when they have been accepted or rejected."
+            ),
         )
 
         # all good

src/teams/apps.py

@@ -10,7 +10,8 @@ class TeamsConfig(AppConfig):
     name = "teams"
 
     def ready(self) -> None:
-        # connect the post_save signal, always including a dispatch_uid to prevent it being called multiple times in corner cases
+        # connect the post_save signal, always including a dispatch_uid to prevent it being
+        # called multiple times in corner cases
         post_save.connect(
             teammember_saved,
             sender="teams.TeamMember",

src/teams/views/base.py

@@ -124,7 +124,10 @@ def dispatch(self, request: HttpRequest, *args: list[Any], **kwargs: dict[str, A
         if not request.user.profile.nickserv_username:
             messages.error(
                 request,
-                "Please go to your profile and set your NickServ username first. Make sure the account is registered with NickServ first!",
+                (
+                    "Please go to your profile and set your NickServ username first. "
+                    "Make sure the account is registered with NickServ first!"
+                ),
             )
             return redirect(
                 "teams:general",
@@ -147,7 +150,10 @@ def get(self, request: HttpRequest, *args: list[Any], **kwargs: dict[str, Any]):
             # this membership is already marked as membership.irc_channel_acl_ok=False, no need to do anything
             messages.error(
                 request,
-                "No need, this membership is already marked as irc_channel_acl_ok=False, so the bot will fix the ACL soon",
+                (
+                    "No need, this membership is already marked as irc_channel_acl_ok=False, "
+                    "so the bot will fix the ACL soon"
+                ),
             )
             return redirect(
                 "teams:general",
@@ -169,7 +175,10 @@ def form_valid(self, form):
         membership.save()
         messages.success(
             self.request,
-            f"OK, hang on while we fix the permissions for your NickServ user '{self.request.user.profile.nickserv_username}' for IRC channel '{form.instance.irc_channel_name}'",
+            (
+                "OK, hang on while we fix the permissions for your NickServ user "
+                f"'{self.request.user.profile.nickserv_username}' for IRC channel '{form.instance.irc_channel_name}'"
+            ),
         )
         return redirect(
             "teams:general",

src/tokens/views.py

@@ -94,7 +94,10 @@ def get(self, request: HttpRequest, *args: list[Any], **kwargs: dict[str, Any]):
             # message for the user
             messages.success(
                 self.request,
-                f"Congratulations! You found a secret token: '{self.get_object().description}' - Your visit has been registered! Keep hunting, there might be more tokens out there.",
+                (
+                    f"Congratulations! You found a secret token: '{self.get_object().description}' "
+                    "- Your visit has been registered! Keep hunting, there might be more tokens out there."
+                ),
             )
         return redirect(reverse("tokens:tokenfind_list"))
 

src/villages/migrations/0013_alter_village_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.14 on 2024-08-25 20:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('villages', '0012_village_approved'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='village',
+            options={'ordering': ('name',)},
+        ),
+    ]