Upgrade django to 5.2 and python to 3.11 (#1911)

daveoconnor · daveoconnor · commit b2e172682db0 · 2025-10-08T17:53:31.000-07:00
diff --git a/.github/workflows/actions-gcp.yaml b/.github/workflows/actions-gcp.yaml
@@ -25,7 +25,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:12
+        image: postgres:16
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -44,10 +44,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.13
 
       - uses: actions/cache@v4
         with:
@@ -133,10 +133,10 @@ jobs:
         run: |
           git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.13
 
       - name: Install Python dependencies
         run: |
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -15,7 +15,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:12
+        image: postgres:16
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -34,10 +34,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.13
 
       - uses: actions/cache@v4
         with:
@@ -85,10 +85,10 @@ jobs:
         run: |
           git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.13
 
       - name: Install Python dependencies
         run: |
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 default_language_version:
-  python: python3.11
+  python: python3.13
 
 exclude: .*migrations\/.*|static\/img\/.*|static\/animations\/.*|static\/js\/boost-gecko\/.*|kube\/boost\/templates\/.*\.yaml
 
@@ -8,7 +8,7 @@ repos:
     rev: "1.27.0"
     hooks:
       - id: django-upgrade
-        args: [--target-version, "4.2"]   # Replace with Django version
+        args: [--target-version, "5.2"]   # Replace with Django version
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Links:
 
 ## Local Development Setup
 
-This project will use Python 3.11, Docker, and Docker Compose.
+This project will use Python 3.13, Docker, and Docker Compose.
 
 Instructions to install those packages are included in [development_setup_notes.md](docs/development_setup_notes.md).
 
diff --git a/core/calendar.py b/core/calendar.py
@@ -20,10 +20,8 @@ def get_calendar(min_time=None, single_events=True, order_by="startTime"):
     https://developers.google.com/calendar/api/v3/reference/events/list
     """
     if not min_time:
-        min_time = (
-            datetime.datetime.utcnow().isoformat() + "Z"
-        )  # 'Z' indicates UTC time
-
+        # 'Z' indicates UTC time
+        min_time = datetime.datetime.now(datetime.timezone.utc).isoformat() + "Z"
     url = f"https://www.googleapis.com/calendar/v3/calendars/{settings.BOOST_CALENDAR}/events?key={settings.CALENDAR_API_KEY}&timeMin={min_time}&singleEvents={single_events}&orderBy={order_by}"
 
     headers = {"Accept": "application/json"}
diff --git a/core/migrations/0003_sitesettings_and_more.py b/core/migrations/0003_sitesettings_and_more.py
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
         migrations.AddConstraint(
             model_name="sitesettings",
             constraint=models.CheckConstraint(
-                check=models.Q(("id", 1)), name="core_sitesettings_single_instance"
+                condition=models.Q(("id", 1)), name="core_sitesettings_single_instance"
             ),
         ),
         migrations.AlterModelOptions(
diff --git a/core/models.py b/core/models.py
@@ -72,7 +72,7 @@ class Meta:
             # check constraint to only allow id=1 to exist
             models.CheckConstraint(
                 name="%(app_label)s_%(class)s_single_instance",
-                check=models.Q(id=1),
+                condition=models.Q(id=1),
             ),
         ]
         verbose_name_plural = "Site Settings"
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:experimental
 
-FROM python:3.11-slim AS builder-py
+FROM python:3.13-slim AS builder-py
 
 ARG LOCAL_DEVELOPMENT
 
@@ -42,7 +42,7 @@ RUN yarn build
 
 
 # Final image.
-FROM python:3.11-slim AS release
+FROM python:3.13-slim AS release
 
 RUN apt update && apt install -y git libpq-dev ruby ruby-dev && rm -rf /var/lib/apt/lists/*
 
diff --git a/docs/dependencies.md b/docs/dependencies.md
@@ -7,3 +7,14 @@
 1. Run `just pip-compile`, which will add the dependency to `requirements.txt`
 1. Run `just rebuild` to rebuild your Docker image to include the new dependencies
 2. Run `just up` and continue with development
+
+## Upgrading dependencies
+
+To upgrade all dependencies to their latest versions, run:
+
+1. `just pip-compile-upgrade`.
+2. Get the django version from requirements.txt and set the `DJANGO_VERSION` value in /justfile
+3. Update the `--target-version` args value for django-upgrade in .pre-commit-config.yaml to match
+3. In a venv with installed packages run `just run-django-upgrade` to upgrade python code.
+4. `just build` to create new docker images.
+5. Tear down docker containers and restart with the newly built images, then test.
diff --git a/justfile b/justfile
@@ -1,6 +1,7 @@
 set dotenv-load := false
 COMPOSE_FILE := "docker-compose.yml"
 ENV_FILE := ".env"
+DJANGO_VERSION := "5.2"
 
 @_default:
     just --list
@@ -122,6 +123,10 @@ alias shell := console
     fi
     @cd development-tofu; direnv allow && tofu destroy
 
+@run-django-upgrade:
+    [ -n "${VIRTUAL_ENV-}" ] || { echo "❌ Activate your venv first."; exit 1; }
+    -git ls-files -z -- '*.py' | xargs -0r django-upgrade --target {{DJANGO_VERSION}}
+
 # Dependency management
 @pip-compile ARGS='':  ## rebuilds our pip requirements
     docker compose run --rm web uv pip compile {{ ARGS }} ./requirements.in --no-strip-extras --output-file ./requirements.txt
diff --git a/news/feeds.py b/news/feeds.py
@@ -1,7 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
-from django.utils.timezone import make_aware, utc
+from django.utils.timezone import make_aware
 from django.utils.html import urlize, linebreaks
 
 from .models import Entry
@@ -22,7 +22,7 @@ def item_pubdate(self, item):
         publish_date = item.publish_at
         if publish_date:
             datetime_obj = datetime.combine(publish_date, datetime.min.time())
-            aware_datetime_obj = make_aware(datetime_obj, timezone=utc)
+            aware_datetime_obj = make_aware(datetime_obj, timezone=timezone.utc)
             return aware_datetime_obj
 
     def item_description(self, item):
diff --git a/news/notifications.py b/news/notifications.py
@@ -60,7 +60,7 @@ def generate_magic_approval_link(entry_slug: str, moderator_id: int):
 def send_email_news_needs_moderation(request, entry):
     recipient_list = [
         u
-        for u in moderators().select_related("preferences").only("email")
+        for u in moderators().select_related("preferences").only("email", "preferences")
         if entry.tag in u.preferences.allow_notification_others_news_needs_moderation
     ]
     if not recipient_list:
diff --git a/news/tests/test_feeds.py b/news/tests/test_feeds.py
@@ -1,5 +1,5 @@
-from datetime import datetime, timedelta
-from django.utils.timezone import make_aware, now, utc
+from datetime import datetime, timedelta, timezone
+from django.utils.timezone import make_aware, now
 from model_bakery import baker
 from ..feeds import RSSNewsFeed, AtomNewsFeed
 
@@ -22,7 +22,8 @@ def test_item_pubdate(make_entry):
     feed = RSSNewsFeed()
     published_entry = make_entry(moderator=baker.make("users.User"), approved_at=now())
     expected_datetime = make_aware(
-        datetime.combine(published_entry.publish_at, datetime.min.time()), timezone=utc
+        datetime.combine(published_entry.publish_at, datetime.min.time()),
+        timezone=timezone.utc,
     )
     assert feed.item_pubdate(published_entry) == expected_datetime
 
@@ -51,6 +52,7 @@ def test_item_pubdate_atom(make_entry):
     feed = AtomNewsFeed()
     published_entry = make_entry(moderator=baker.make("users.User"), approved_at=now())
     expected_datetime = make_aware(
-        datetime.combine(published_entry.publish_at, datetime.min.time()), timezone=utc
+        datetime.combine(published_entry.publish_at, datetime.min.time()),
+        timezone=timezone.utc,
     )
     assert feed.item_pubdate(published_entry) == expected_datetime
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ whitelist-regex = ["test_.*"]
 
 [tool.ruff]
 line-length = 88
-target-version = "py311"
+target-version = "py313"
 
 [tool.black]
 line-length = 88
diff --git a/requirements-dev.in b/requirements-dev.in
@@ -1,3 +1,3 @@
 -c requirements.txt
 django-debug-toolbar
-pydevd-pycharm==243.26053.29  # pinned to appropriate version for current pycharm
+pydevd-pycharm==252.26830.99  # pinned to appropriate version for current pycharm
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,16 +1,16 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile ./requirements-dev.in --no-strip-extras --output-file ./requirements-dev.txt
-asgiref==3.9.1
+asgiref==3.10.0
     # via
     #   -c ./requirements.txt
     #   django
-django==4.2.24
+django==5.2.7
     # via
     #   -c ./requirements.txt
     #   django-debug-toolbar
 django-debug-toolbar==6.0.0
     # via -r ./requirements-dev.in
-pydevd-pycharm==243.26053.29
+pydevd-pycharm==252.26830.99
     # via -r ./requirements-dev.in
 sqlparse==0.5.3
     # via
diff --git a/requirements.in b/requirements.in
@@ -1,4 +1,4 @@
-Django>=4.0, <5.0
+Django>=5.0, <6.0
 bumpversion
 django-admin-env-notice
 django-allauth
@@ -12,7 +12,7 @@ django-health-check
 django-imagekit
 django-oauth-toolkit
 django-redis
-django-rest-auth
+django-upgrade
 django-widget-tweaks
 djangorestframework
 environs[django]
diff --git a/requirements.txt b/requirements.txt
diff --git a/slack/migrations/0001_initial.py b/slack/migrations/0001_initial.py
diff --git a/slack/models.py b/slack/models.py
diff --git a/versions/feeds.py b/versions/feeds.py
diff --git a/versions/tests/test_feeds.py b/versions/tests/test_feeds.py

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class Meta:`
`72`	`72`	`# check constraint to only allow id=1 to exist`
`73`	`73`	`models.CheckConstraint(`
`74`	`74`	`name="%(app_label)s_%(class)s_single_instance",`
`75`		`- check=models.Q(id=1),`
	`75`	`+ condition=models.Q(id=1),`
`76`	`76`	`),`
`77`	`77`	`]`
`78`	`78`	`verbose_name_plural = "Site Settings"`