Backend version updates (#605)

* first pass * configure ruff * pin black version * update Python version in backend check, revert pin black version * fix..? * switch to Python 3.11, fix tests * fix dependency * lint * fix channels * use ruff w/shared actions, remove black, flake8, isort * oops lol * this is embarrassing * use 3.11 base image * temporarily add integration tests * attempt to fix * fixed django base * fix integration tests * fix csrf? * plz * remove integration tests
pennlabs · Feb 20, 2024 · 260a2b9 · 260a2b9
1 parent 6c9ebd7
commit 260a2b9
Show file tree

Hide file tree

Showing 122 changed files with 1,505 additions and 1,610 deletions.
diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml
@@ -8,12 +8,14 @@ on: push
 jobs:
   backend-check:
     name: "Backend Check"
-    uses: pennlabs/shared-actions/.github/workflows/django.yaml@8785a7d7b9158d8d5705a0202f5695db2c0beb97
+    uses: pennlabs/shared-actions/.github/workflows/django.yaml@e6edf59024578b2ddbe6d5b79fa49a7137a63d36
     with:
       projectName: pennclubs
       path: backend
-      flake: true
-      black: true
+      pythonVersion: 3.11-bookworm
+      flake: false
+      black: false
+      ruff: true
 
   frontend-check:
     name: "Frontend Check"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,29 +2,21 @@
 repos:
   - repo: local
     hooks:
-      - id: black
-        name: black
-        entry: bash -c "export PIPENV_IGNORE_VIRTUALENVS=1 && cd backend && pipenv run black ."
+      - id: ruff-format
+        name: Ruff Formatter
+        entry: bash -c "export PIPENV_IGNORE_VIRTUALENVS=1 && cd backend && pipenv run ruff format ."
         language: python
         types: [python]
         require_serial: true
         files: ^backend/
         pass_filenames: false
-      - id: isort
-        name: isort
-        entry: isort
+      - id: ruff-lint-fix
+        name: Ruff Lint (Apply Fixes)
+        entry: ruff check . --fix
         language: python
         types: [python]
         require_serial: true
         files: ^backend/
-      - id: flake8
-        name: flake8
-        entry: flake8
-        language: python
-        types: [python]
-        require_serial: true
-        files: ^backend/
-        args: [--config, backend/setup.cfg]
       - id: frontend
         name: Yarn Linter
         entry: bash -c "cd frontend && yarn lint"

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM pennlabs/django-base:9c4f31bf1af44219d0f9019271a0033a222291c2-3.8.5
+FROM pennlabs/django-base:b269ea1613686b1ac6370154debbb741b012de1a-3.11
 
 LABEL maintainer="Penn Labs"
 

diff --git a/backend/Pipfile b/backend/Pipfile
@@ -4,20 +4,16 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-black = "==19.10b0"
 unittest-xml-reporting = ">=3.0.2"
-flake8 = "==5.0.3"
-flake8-isort = "*"
-isort = "*"
-flake8-quotes = "*"
 django-debug-toolbar = "*"
 django-extensions = "*"
+ruff = "*"
 
 [packages]
 dj-database-url = "*"
 djangorestframework = "*"
 sentry-sdk = "*"
-django = "<4"
+django = ">=5"
 django-labs-accounts = "*"
 drf-nested-routers = "*"
 "bs4" = "*"
@@ -34,7 +30,7 @@ qrcode = "*"
 python-dateutil = "*"
 psycopg2 = "*"
 django-simple-history = "*"
-channels = "<3"
+channels = {extras = ["daphne"], version = "*"}
 django-runtime-options = "*"
 social-auth-app-django = "*"
 django-redis = "*"
@@ -44,7 +40,7 @@ uvloop = {version = "*", sys_platform = "== 'linux'"}
 uvicorn = {extras = ["standard"], version = "*"}
 gunicorn = "*"
 httptools = "*"
-ics = "==0.7"
+ics = "*"
 urlextract = "*"
 jsonref = "*"
 unittest-xml-reporting = "*"
@@ -59,4 +55,4 @@ numpy = "*"
 coverage = "*"
 
 [requires]
-python_version = "3"
+python_version = "3.11"
diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock
diff --git a/backend/clubs/management/commands/import_paideia_events.py b/backend/clubs/management/commands/import_paideia_events.py
@@ -23,7 +23,7 @@ def handle(self, *args, **kwargs):
             "https://snfpaideia.upenn.edu/wp-json/wp/v2/event?"
             "order=asc&per_page=100&page=1&onlyInclude=upcoming_events"
         )
-        with (urllib.request.urlopen(url)) as data:
+        with urllib.request.urlopen(url) as data:
             parsed_json = json.loads(data.read().decode())
             for event in parsed_json:
                 try:

diff --git a/backend/clubs/management/commands/merge_duplicates.py b/backend/clubs/management/commands/merge_duplicates.py
@@ -180,7 +180,8 @@ def merge_clubs(one, two):
         Membership.objects.filter(club=primary).values_list("person__id", flat=True)
     )
     Membership.objects.filter(
-        club=secondary, person__in=duplicate_memberships,
+        club=secondary,
+        person__in=duplicate_memberships,
     ).delete()
     Membership.objects.filter(club=secondary).update(club=primary)
 

diff --git a/backend/clubs/management/commands/populate.py b/backend/clubs/management/commands/populate.py
@@ -672,7 +672,10 @@ def get_image(url):
                 status_counter % len(ApplicationSubmission.STATUS_TYPES)
             ][0]
             ApplicationSubmission.objects.create(
-                status=status, user=user, application=application, committee=None,
+                status=status,
+                user=user,
+                application=application,
+                committee=None,
             )
             status_counter += 1
             for committee in application.committees.all():

diff --git a/backend/clubs/management/commands/send_emails.py b/backend/clubs/management/commands/send_emails.py
@@ -202,14 +202,17 @@ def handle(self, *args, **kwargs):
 
         if action == "update_status_reminder":
             wc_badge = Badge.objects.filter(
-                label="Wharton Council", purpose="org",
+                label="Wharton Council",
+                purpose="org",
             ).first()
             clubs = Club.objects.filter(badges__in=[wc_badge])
             payloads = []
             for club in clubs:
                 emails = (
                     Membership.objects.filter(
-                        role__lte=Membership.ROLE_OFFICER, club__active=True, club=club,
+                        role__lte=Membership.ROLE_OFFICER,
+                        club__active=True,
+                        club=club,
                     )
                     .values_list("person__email", flat=True)
                     .distinct()
@@ -220,7 +223,7 @@ def handle(self, *args, **kwargs):
                 payloads.append((applications_url, emails))
             if test_email is not None:
                 payloads = [(payloads[0][0], [test_email])]
-            for (applications_url, emails) in payloads:
+            for applications_url, emails in payloads:
                 for email in emails:
                     if not dry_run:
                         template = "update_status_reminder"

diff --git a/backend/clubs/migrations/0001_initial.py b/backend/clubs/migrations/0001_initial.py
@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

diff --git a/backend/clubs/migrations/0002_auto_20190926_1641.py b/backend/clubs/migrations/0002_auto_20190926_1641.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0001_initial")]
 
     operations = [

diff --git a/backend/clubs/migrations/0003_auto_20191025_2102.py b/backend/clubs/migrations/0003_auto_20191025_2102.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0002_auto_20190926_1641")]
 
     operations = [

diff --git a/backend/clubs/migrations/0003_auto_20191025_2120.py b/backend/clubs/migrations/0003_auto_20191025_2120.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0002_auto_20190926_1641")]
 
     operations = [

diff --git a/backend/clubs/migrations/0004_merge_20191025_2143.py b/backend/clubs/migrations/0004_merge_20191025_2143.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("clubs", "0003_auto_20191025_2102"),
         ("clubs", "0003_auto_20191025_2120"),

diff --git a/backend/clubs/migrations/0005_auto_20191025_2218.py b/backend/clubs/migrations/0005_auto_20191025_2218.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0004_merge_20191025_2143")]
 
     operations = [

diff --git a/backend/clubs/migrations/0006_profile.py b/backend/clubs/migrations/0006_profile.py
@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("auth", "0011_update_proxy_permissions"),
         ("clubs", "0005_auto_20191025_2218"),

diff --git a/backend/clubs/migrations/0007_auto_20191103_1843.py b/backend/clubs/migrations/0007_auto_20191103_1843.py
@@ -19,7 +19,6 @@ def reverse_func(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0006_profile")]
 
     operations = [migrations.RunPython(forwards_func, reverse_func)]
diff --git a/backend/clubs/migrations/0008_auto_20191111_1835.py b/backend/clubs/migrations/0008_auto_20191111_1835.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0007_auto_20191103_1843")]
 
     operations = [

diff --git a/backend/clubs/migrations/0008_subscribe.py b/backend/clubs/migrations/0008_subscribe.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("clubs", "0007_auto_20191103_1843"),

diff --git a/backend/clubs/migrations/0009_merge_20191206_2311.py b/backend/clubs/migrations/0009_merge_20191206_2311.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0008_subscribe"), ("clubs", "0008_auto_20191111_1835")]
 
     operations = []
diff --git a/backend/clubs/migrations/0010_note_notetag.py b/backend/clubs/migrations/0010_note_notetag.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("clubs", "0009_merge_20191206_2311"),

diff --git a/backend/clubs/migrations/0011_auto_20200103_1615.py b/backend/clubs/migrations/0011_auto_20200103_1615.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0010_note_notetag")]
 
     operations = [

diff --git a/backend/clubs/migrations/0012_testimonial.py b/backend/clubs/migrations/0012_testimonial.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0011_auto_20200103_1615")]
 
     operations = [

diff --git a/backend/clubs/migrations/0013_auto_20200112_2104.py b/backend/clubs/migrations/0013_auto_20200112_2104.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("clubs", "0012_testimonial")]
 
     operations = [

diff --git a/backend/clubs/migrations/0014_club_youtube.py b/backend/clubs/migrations/0014_club_youtube.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("clubs", "0013_auto_20200112_2104"),
     ]

diff --git a/backend/clubs/migrations/0015_auto_20200119_1422.py b/backend/clubs/migrations/0015_auto_20200119_1422.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("clubs", "0014_club_youtube"),
     ]

diff --git a/backend/clubs/migrations/0016_auto_20200128_2024.py b/backend/clubs/migrations/0016_auto_20200128_2024.py
@@ -4,13 +4,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("clubs", "0015_auto_20200119_1422"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name="event", name="description", field=models.TextField(blank=True),
+            model_name="event",
+            name="description",
+            field=models.TextField(blank=True),
         ),
     ]
diff --git a/backend/clubs/migrations/0017_joinrequest.py b/backend/clubs/migrations/0017_joinrequest.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("clubs", "0016_auto_20200128_2024"),

diff --git a/backend/clubs/migrations/0017_report.py b/backend/clubs/migrations/0017_report.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("clubs", "0016_auto_20200128_2024"),

diff --git a/backend/clubs/migrations/0018_auto_20200207_1737.py b/backend/clubs/migrations/0018_auto_20200207_1737.py
@@ -5,12 +5,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("clubs", "0017_joinrequest"),
     ]
 
     operations = [
-        migrations.RenameModel(old_name="JoinRequest", new_name="MembershipRequest",),
+        migrations.RenameModel(
+            old_name="JoinRequest",
+            new_name="MembershipRequest",
+        ),
     ]
diff --git a/backend/clubs/migrations/0019_merge_20200228_1615.py b/backend/clubs/migrations/0019_merge_20200228_1615.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("clubs", "0018_auto_20200207_1737"),
         ("clubs", "0017_report"),

diff --git a/backend/clubs/migrations/0020_auto_20200228_1651.py b/backend/clubs/migrations/0020_auto_20200228_1651.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("clubs", "0019_merge_20200228_1615"),

diff --git a/backend/clubs/migrations/0021_auto_20200307_1913.py b/backend/clubs/migrations/0021_auto_20200307_1913.py
@@ -4,13 +4,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("clubs", "0020_auto_20200228_1651"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name="event", name="code", field=models.SlugField(max_length=255),
+            model_name="event",
+            name="code",
+            field=models.SlugField(max_length=255),
         ),
     ]
diff --git a/backend/clubs/migrations/0022_auto_20200308_1116.py b/backend/clubs/migrations/0022_auto_20200308_1116.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("clubs", "0021_auto_20200307_1913"),