Merge pull request #8 from opennorth/upgrade

Upgrade Python and Django

.github/workflows/lint.yml

@@ -0,0 +1,14 @@
+name: Lint
+on: [push, pull_request]
+jobs:
+  build:
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - run: pip install --upgrade flake8 isort
+      - run: flake8 .
+      - run: isort .

pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"

representatives/admin.py

@@ -2,33 +2,39 @@
 
 from django.contrib import admin, messages
 
-from representatives.models import RepresentativeSet, Representative, Election, Candidate, app_settings
+from representatives.models import Candidate, Election, Representative, RepresentativeSet, app_settings
 
 
+@admin.register(RepresentativeSet)
 class RepresentativeSetAdmin(admin.ModelAdmin):
     actions = ['update_from_data_source']
     list_display = ['name', 'last_import_time', 'last_import_successful', 'enabled']
     list_filter = ['last_import_successful', 'enabled']
 
+    @admin.action(
+        description="Update from data source"
+    )
     def update_from_data_source(self, request, queryset):
         for individual_set in queryset:
             try:
                 count = individual_set.update_from_data_source()
             except Exception:
-                messages.error(request, "Couldn't update individuals in %s: %s" % (individual_set, traceback.format_exc()))
+                messages.error(request, f"Couldn't update individuals in {individual_set}: {traceback.format_exc()}")
                 continue
             if count is False:
-                messages.error(request, "Couldn't update individuals in %s." % individual_set)
+                messages.error(request, f"Couldn't update individuals in {individual_set}.")
             else:
-                message = "Updated %s individuals in %s." % (count, individual_set)
+                message = f"Updated {count} individuals in {individual_set}."
                 no_boundaries = individual_set.individuals.filter(boundary='').values_list('name', flat=True)
                 if no_boundaries:
-                    messages.warning(request, message + " %d match no boundary (%s)." % (len(no_boundaries), ', '.join(no_boundaries)))
+                    messages.warning(
+                        request, message + f" {len(no_boundaries)} match no boundary ({', '.join(no_boundaries)})."
+                    )
                 else:
                     messages.success(request, message)
-    update_from_data_source.short_description = "Update from data source"
 
 
+@admin.register(Representative)
 class RepresentativeAdmin(admin.ModelAdmin):
     list_display = ['name', 'representative_set', 'district_name', 'elected_office', 'boundary']
     list_filter = ['representative_set']
@@ -41,8 +47,6 @@ class CandidateAdmin(admin.ModelAdmin):
     search_fields = ['name', 'district_name', 'elected_office']
 
 
-admin.site.register(RepresentativeSet, RepresentativeSetAdmin)
-admin.site.register(Representative, RepresentativeAdmin)
 if app_settings.ENABLE_CANDIDATES:
     admin.site.register(Election, RepresentativeSetAdmin)
     admin.site.register(Candidate, CandidateAdmin)

representatives/management/commands/updaterepresentatives.py

@@ -1,9 +1,9 @@
-import logging
 import itertools
+import logging
 
 from django.core.management.base import BaseCommand
 
-from representatives.models import RepresentativeSet, Election
+from representatives.models import Election, RepresentativeSet
 
 log = logging.getLogger(__name__)
 
@@ -12,9 +12,13 @@ class Command(BaseCommand):
     help = 'Updates representatives from sources.'
 
     def handle(self, *args, **options):
-        for representative_set in itertools.chain(RepresentativeSet.objects.filter(enabled=True), Election.objects.filter(enabled=True)):
+        for representative_set in itertools.chain(
+            RepresentativeSet.objects.filter(enabled=True), Election.objects.filter(enabled=True)
+        ):
             try:
                 representative_set.update_from_data_source()
             except Exception:
                 log.error("Couldn't update representatives in %s." % representative_set)
-                representative_set.__class__.objects.filter(pk=representative_set.pk).update(last_import_successful=False)
+                representative_set.__class__.objects.filter(pk=representative_set.pk).update(
+                    last_import_successful=False
+                )

representatives/migrations/0001_initial.py

@@ -1,15 +1,13 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from django.db import migrations, models
 
-from django.db import models, migrations
 
 class JSONField(models.TextField):
     """Mocks jsonfield 0.92's column-type behaviour"""
     def db_type(self, connection):
         if connection.vendor == 'postgresql' and connection.pg_version >= 90300:
             return 'json'
         else:
-            return super(JSONField, self).db_type(connection)
+            return super().db_type(connection)
 
 class Migration(migrations.Migration):
 
@@ -110,13 +108,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='representative',
             name='representative_set',
-            field=models.ForeignKey(related_name='individuals', to='representatives.RepresentativeSet'),
+            field=models.ForeignKey(on_delete=models.CASCADE, related_name='individuals', to='representatives.RepresentativeSet'),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='candidate',
             name='election',
-            field=models.ForeignKey(related_name='individuals', to='representatives.Election'),
+            field=models.ForeignKey(on_delete=models.CASCADE, related_name='individuals', to='representatives.Election'),
             preserve_default=True,
         ),
     ]

representatives/migrations/0002_auto_20141129_1450.py

@@ -1,15 +1,13 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from django.db import migrations, models
 
-from django.db import models, migrations
 
 class JSONField(models.TextField):
     """Mocks jsonfield 0.92's column-type behaviour"""
     def db_type(self, connection):
         if connection.vendor == 'postgresql' and connection.pg_version >= 90300:
             return 'json'
         else:
-            return super(JSONField, self).db_type(connection)
+            return super().db_type(connection)
 
 
 class Migration(migrations.Migration):

representatives/migrations/0003_auto_20170214_1237.py

@@ -1,16 +1,15 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.11 on 2017-02-14 12:37
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 
+
 class JSONField(models.TextField):
     """Mocks jsonfield 0.92's column-type behaviour"""
     def db_type(self, connection):
         if connection.vendor == 'postgresql' and connection.pg_version >= 90300:
             return 'json'
         else:
-            return super(JSONField, self).db_type(connection)
+            return super().db_type(connection)
 
 class Migration(migrations.Migration):
 

representatives/migrations/0004_switch_to_django_jsonfield.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-02-23 20:05
-from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations