Bump ruff to 0.15.22 and repair the lint gate

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.2.2'
+  rev: 'v0.15.22'
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix, --extend-exclude, TCH]

cdk/app.py

@@ -22,9 +22,9 @@
 # Set the DC Environment early on. This is important to be able to conditionally
 # change the stack configurations
 dc_environment = app.node.try_get_context("dc-environment") or None
-assert (
-    dc_environment in valid_environments
-), f"context `dc-environment` must be one of {valid_environments}"
+assert dc_environment in valid_environments, (
+    f"context `dc-environment` must be one of {valid_environments}"
+)
 
 
 YnrStack(

pyproject.toml

@@ -85,8 +85,8 @@ dev = [
     "pytest-cov==4.0.0",
     "pytest-django==4.5.2",
     "pytest-freezegun==0.4.2",
-    "pytest-ruff==0.2.1",
-    "ruff==0.2.2",
+    "pytest-ruff==0.5",
+    "ruff==0.15.22",
     "watchdog==4.0.2",
     "WebTest==3.0.0",
 ]

ynr/apps/api/tests/test_api_next.py

@@ -210,7 +210,7 @@ def test_all_parties_view(self):
                             },
                             {
                                 "id": "PP53__1",
-                                "text": "Labour Party " "Candidate",
+                                "text": "Labour Party Candidate",
                                 "register": "GB",
                             },
                         ],

ynr/apps/auth_helpers/views.py

@@ -12,7 +12,6 @@ def user_in_group(user, group_name):
 
 
 class GroupRequiredMixin(object):
-
     """A mixin that requires the user is a member of a particular group
 
     You should set 'required_group_name' on the class that uses this

ynr/apps/bulk_adding/forms.py

@@ -121,9 +121,9 @@ def total_form_count(self) -> int:
     def get_form_kwargs(self, index):
         kwargs = super().get_form_kwargs(index)
         kwargs["party_choices"] = self.parties
-        kwargs[
-            "previous_party_affiliations_choices"
-        ] = self.previous_party_affiliations_choices
+        kwargs["previous_party_affiliations_choices"] = (
+            self.previous_party_affiliations_choices
+        )
         return kwargs
 
     @property

ynr/apps/bulk_adding/tests/test_bulk_add_by_party.py

@@ -199,9 +199,9 @@ def test_submit_name_and_social_media_links_for_area(self):
         form[f"{ballot.pk}-0-person_identifiers_0_1"] = "homepage_url"
         form[f"{ballot.pk}-0-person_identifiers_1_0"] = "pp@gmail.com"
         form[f"{ballot.pk}-0-person_identifiers_1_1"] = "email"
-        form[
-            f"{ballot.pk}-0-person_identifiers_2_0"
-        ] = "https://linkedin.com/in/pamphero"
+        form[f"{ballot.pk}-0-person_identifiers_2_0"] = (
+            "https://linkedin.com/in/pamphero"
+        )
         form[f"{ballot.pk}-0-person_identifiers_2_1"] = "linkedin_url"
 
         response = form.submit().follow()
@@ -305,22 +305,22 @@ def test_bulk_add_with_100_ballots(self):
         form["source"] = "https://example.com/candidates/"
         for ballot in ballots:
             form[f"{ballot.pk}-0-name"] = f"Candidate {ballot.pk}"
-            form[
-                f"{ballot.pk}-0-biography"
-            ] = f"Biography for Candidate {ballot.pk}"
+            form[f"{ballot.pk}-0-biography"] = (
+                f"Biography for Candidate {ballot.pk}"
+            )
             form[f"{ballot.pk}-0-gender"] = "female"
             form[f"{ballot.pk}-0-birth_date"] = "1990"
-            form[
-                f"{ballot.pk}-0-person_identifiers_0_0"
-            ] = f"https://example.com/{ballot.pk}"
+            form[f"{ballot.pk}-0-person_identifiers_0_0"] = (
+                f"https://example.com/{ballot.pk}"
+            )
             form[f"{ballot.pk}-0-person_identifiers_0_1"] = "homepage_url"
-            form[
-                f"{ballot.pk}-0-person_identifiers_1_0"
-            ] = f"candidate{ballot.pk}@example.com"
+            form[f"{ballot.pk}-0-person_identifiers_1_0"] = (
+                f"candidate{ballot.pk}@example.com"
+            )
             form[f"{ballot.pk}-0-person_identifiers_1_1"] = "email"
-            form[
-                f"{ballot.pk}-0-person_identifiers_2_0"
-            ] = f"https://linkedin.com/in/candidate{ballot.pk}"
+            form[f"{ballot.pk}-0-person_identifiers_2_0"] = (
+                f"https://linkedin.com/in/candidate{ballot.pk}"
+            )
             form[f"{ballot.pk}-0-person_identifiers_2_1"] = "linkedin_url"
 
         # Submit the form

ynr/apps/bulk_adding/views/sopns.py

@@ -286,9 +286,9 @@ def get_context_data(self, **kwargs):
                 )
                 if party_description:
                     form["description_id"] = party_description
-                    form[
-                        "party_description_text"
-                    ] = party_description.description
+                    form["party_description_text"] = (
+                        party_description.description
+                    )
 
             form["name"] = candidacy["name"]
             form["party_id"] = party_obj.ec_id

ynr/apps/cached_counts/filters.py

@@ -12,14 +12,14 @@
 class CompletenessFilter(django_filters.FilterSet):
     def __init__(self, data=None, queryset=None, *, request=None, prefix=None):
         for identifier in PersonIdentifierFields:
-            self.base_filters[
-                f"has_{identifier.name}"
-            ] = django_filters.ChoiceFilter(
-                field_name=identifier.name,
-                method="filter_null_or_empty_str",
-                label=f"Has {identifier.value}",
-                choices=[("yes", "Yes"), ("no", "No")],
-                widget=forms.HiddenInput,
+            self.base_filters[f"has_{identifier.name}"] = (
+                django_filters.ChoiceFilter(
+                    field_name=identifier.name,
+                    method="filter_null_or_empty_str",
+                    label=f"Has {identifier.value}",
+                    choices=[("yes", "Yes"), ("no", "No")],
+                    widget=forms.HiddenInput,
+                )
             )
 
         super().__init__(data, queryset, request=request, prefix=prefix)