Single ruff linter

.github/workflows/lint.yml

@@ -10,14 +10,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: black Lint
-        uses: psf/black@stable
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          options: "--check --diff"
-          src: "."
-          version: "24.3.0"
-      - name: isort Lint
-        uses: isort/isort-action@master
-      - name: flake8 Lint
-        uses: py-actions/flake8@v2
+          python-version: '3.9' 
+      - name: run ruff linter and formatter
+        run: |
+          pip install ruff==0.4.9
+          ruff check .
+          ruff format . --check

hub/management/commands/base_importers.py

@@ -312,7 +312,6 @@ class BaseConstituencyGroupListImportCommand(BaseAreaImportCommand):
     do_not_convert = True
 
     def process_data(self, df: pd.DataFrame):
-
         if not self._quiet:
             self.stdout.write(f"{self.message} ({self.area_type})")
 
@@ -372,7 +371,6 @@ def set_data_type(self):
         self.data_type = list(self.data_types.values())[0]
 
     def get_dataframe(self):
-
         if not self.data_file.exists():
             return None
 

hub/management/commands/import_2024_aid_alliance_power_postcodes.py

@@ -89,7 +89,6 @@ def add_area(self, gss):
         return None
 
     def get_df(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_air_quality_data.py

@@ -62,7 +62,7 @@ class Command(BaseCommand):
             "pollutant": "NOx",
             "metric": "Annual mean",
             "header_label": "nox2021",
-            "comments": "µg m\u207B\u00B3 (NO\u2093 as NO\u2082)",
+            "comments": "µg m\u207b\u00b3 (NO\u2093 as NO\u2082)",
             "csv_link": "https://uk-air.defra.gov.uk/datastore/pcm/mapnox2021.csv",
         },
         "so_2": {
@@ -75,7 +75,7 @@ class Command(BaseCommand):
             "pollutant": "Ozone",
             "metric": "DGT120",
             "header_label": "dgt12021",
-            "comments": "number of days on which the daily max 8-hr concentration is greater than 120 µg m\u207B\u00B3",
+            "comments": "number of days on which the daily max 8-hr concentration is greater than 120 µg m\u207b\u00b3",
             "csv_link": "https://uk-air.defra.gov.uk/datastore/pcm/mapdgt12021.csv",
         },
         "benzene": {
@@ -155,7 +155,6 @@ def delete_data(self):
         AreaData.objects.filter(data_type__in=self.data_types).delete()
 
     def get_dataframe(self):
-
         if not self.gridcode_lookup_file.exists():
             return None
 

hub/management/commands/import_brexit_votes.py

@@ -39,7 +39,6 @@ class Command(BaseImportFromDataFrameCommand):
     }
 
     def get_dataframe(self):
-
         if not self.data_file.exists():
             return None
 

hub/management/commands/import_brexit_votes_new_cons.py

@@ -36,7 +36,6 @@ class Command(BaseImportFromDataFrameCommand):
     }
 
     def get_dataframe(self):
-
         if not self.data_file.exists():
             return None
 

hub/management/commands/import_cen_nzsg_members.py

@@ -16,7 +16,6 @@ def handle(self, quiet=False, *args, **options):
         self.import_results()
 
     def get_df(self):
-
         file_loc = Path("data", "cen_nzsg_members.csv")
         if not file_loc.exists():
             return None

hub/management/commands/import_christian_aid_campaign_organisers.py

@@ -45,7 +45,6 @@ class Command(BaseImportFromDataFrameCommand):
     }
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_christian_aid_group_locations.py

@@ -89,7 +89,6 @@ def build_constituency_name_lookup(self):
         return names_lookup_dict
 
     def get_df(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_council_scorecards_score.py

@@ -142,7 +142,6 @@ def add_data_sets(self, df):
             self.data_types[name] = data_type
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_efpc_fuel_poverty_data.py

@@ -45,7 +45,6 @@ def delete_data(self):
         ).delete()
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_foe_constituency_reports.py

@@ -39,7 +39,6 @@ def get_row_data(self, row, conf):
         }
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_foe_supporters.py

@@ -56,7 +56,6 @@ class Command(BaseImportFromDataFrameCommand):
     }
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_hftf_trained_constituents.py

@@ -44,7 +44,6 @@ class Command(BaseImportFromDataFrameCommand):
     }
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_hnh_polling_data.py

@@ -347,12 +347,10 @@ def log(self, message):
             self.stdout.write(message)
 
     def extract_and_save_data(self):
-
         self.log(self.message)
 
         area_type = self.get_area_type()
         for file in self.files:
-
             file_loc = settings.BASE_DIR / "data" / file["source_filename"]
 
             if not file_loc.exists():
@@ -435,7 +433,6 @@ def delete_data(self):
     def update_averages(self):
         self.log("Calculating averages for DataTypes:")
         for file in self.files:
-
             file_loc = settings.BASE_DIR / "data" / file["source_filename"]
 
             if not file_loc.exists():
@@ -469,7 +466,6 @@ def update_averages(self):
     def update_max_min(self):
         self.log("Calculating min/max values for DataTypes:")
         for file in self.files:
-
             file_loc = settings.BASE_DIR / "data" / file["source_filename"]
 
             if not file_loc.exists():

hub/management/commands/import_last_election_data.py

@@ -89,7 +89,6 @@ def get_area_type(self):
         return AreaType.objects.get(code=self.area_type)
 
     def get_general_election_data(self):
-
         df = pd.read_csv(
             self.general_election_source_file,
             usecols=[

hub/management/commands/import_mp_job_titles.py

@@ -32,7 +32,6 @@ def get_area_type(self):
         return AreaType.objects.get(code="WMC")
 
     def get_df(self):
-
         if not self.data_file.exists():
             self.stderr.write(f"Data file {self.data_file} does not exist")
             return None
@@ -109,7 +108,6 @@ def add_results(self, results, data_type):
         PersonData.objects.filter(data_type=data_type).exclude(pk__in=mp_list).delete()
 
     def import_results(self):
-
         df = self.get_df()
 
         if df is None:

hub/management/commands/import_mps_appg_data.py

@@ -54,7 +54,6 @@ def add_mps(self, df):
         return df
 
     def get_climate_appgs(self):
-
         climate_appgs_list = Path("data", "climate_APPGs.txt")
 
         if not climate_appgs_list.exists():

hub/management/commands/import_mps_standing_down_2024.py

@@ -48,7 +48,6 @@ def get_person_from_name(self, name):
             return None
 
     def get_df(self):
-
         if not self.data_file.exists():
             self.stderr.write(f"Data file {self.data_file} does not exist")
             return None

hub/management/commands/import_new_constituencies.py

@@ -23,7 +23,6 @@ def add_arguments(self, parser):
         )
 
     def download_constituencies(self):
-
         source_file = "https://pages.mysociety.org/2025-constituencies/data/parliament_con_2025/latest/parl_constituencies_2025.parquet"
         parquet_path = settings.BASE_DIR / "data" / "parl_constituencies_2025.parquet"
 

hub/management/commands/import_nt_property_locations.py

@@ -81,7 +81,6 @@ def get_df(self) -> Optional[pd.DataFrame]:
         return pd.read_csv(self.data_file)
 
     def process_data(self, df: pd.DataFrame):
-
         # df.group_name = df.group_name.apply(
         # lambda x: x.split(" | ")[0] if type(x) == str else x
         # )

hub/management/commands/import_onward_polling_data.py

@@ -88,7 +88,6 @@ def build_constituency_name_lookup(self):
         return names_lookup_dict
 
     def get_dataframe(self):
-
         if not self.data_file.exists():
             return None
 

hub/management/commands/import_red_blue_wall_constituencies.py

@@ -40,7 +40,6 @@ class Command(BaseImportFromDataFrameCommand):
     }
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_rspb_nature_reserves.py

@@ -70,7 +70,6 @@ class Command(MultipleAreaTypesMixin, BaseConstituencyGroupListImportCommand):
     count_data_type = "rspb_reserves_count"
 
     def get_df(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_tcc_open_letter_signatures.py

@@ -66,7 +66,6 @@ class Command(BaseConstituencyGroupListImportCommand):
     count_data_type = "tcc_open_letter_signatories_count"
 
     def get_df(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_wi_group_locations.py

@@ -78,7 +78,6 @@ class Command(MultipleAreaTypesMixin, BaseConstituencyGroupListImportCommand):
     count_data_type = "constituency_wi_group_count"
 
     def get_df(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_wildlife_trust_reserves.py

@@ -76,7 +76,6 @@ class Command(MultipleAreaTypesMixin, BaseConstituencyGroupListImportCommand):
     }
 
     def get_df(self):
-
         if self.data_file.exists() is False:
             return None
 

hub/management/commands/import_wildlife_trusts_regions.py

@@ -39,7 +39,6 @@ class Command(BaseConstituencyGroupListImportCommand):
     group_data_type = "wildlife_trusts_regions"
 
     def get_df(self):
-
         if not self.data_file.exists():
             return None
 

hub/management/commands/import_wwf_supporters.py

@@ -39,7 +39,6 @@ class Command(BaseImportFromDataFrameCommand):
     }
 
     def get_dataframe(self):
-
         if self.data_file.exists() is False:
             return None
 

manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys