Update Python version to 3.12 (#62)

* Update Python version to 3.12
* Update code for 3.12

Author: jgraham

.taskcluster.yml

@@ -31,20 +31,12 @@ tasks:
         - tox
       jobs:
         include:
-          - name: tests python 3.10 django 4.x
-            version: "3.10"
-            env:
-              TOXENV: py310
-          - name: tests python 3.11 django 4.x
-            version: "3.11"
-            env:
-              TOXENV: py311
-          - name: tests python 3.12 (no django)
+          - name: tests python 3.12
             version: "3.12"
             env:
               TOXENV: py312
           - name: linting
-            version: "3.9"
+            version: "3.12"
             script:
               - bash
               - '-xec'

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine as frontend
+FROM node:18-alpine AS frontend
 
 COPY server/frontend /src
 RUN chown -R node:node /src
@@ -8,7 +8,7 @@ WORKDIR /src
 RUN npm install
 RUN npm run production
 
-FROM python:3.10-alpine as backend
+FROM python:3.12-alpine AS backend
 
 RUN apk add --no-cache build-base git mariadb-dev && pip install tomli
 
@@ -20,7 +20,7 @@ RUN cd /src && \
    python -c "import tomli; from itertools import chain; pyp=tomli.load(open('pyproject.toml','rb')); deps=pyp['project']['dependencies']; extras=pyp['project']['optional-dependencies']; print('\0'.join(chain(deps, extras['docker'], extras['server'])))" | xargs -0 pip wheel -q -c requirements.txt --wheel-dir /var/cache/wheels && \
    pip wheel -q --wheel-dir /var/cache/wheels wheel setuptools_scm[toml]
 
-FROM python:3.10-alpine
+FROM python:3.12-alpine
 
 RUN adduser -D worker && \
    apk add --no-cache bash git mariadb-client mariadb-connector-c openssh-client-default && \
@@ -46,18 +46,18 @@ RUN mkdir -p /data/fuzzing-tc-config && chown -R worker:worker /src /data/fuzzin
 # Note: the extras must be duplicated above in the Python
 #       script to pre-install dependencies.
 USER worker
-ENV PATH "${PATH}:/home/worker/.local/bin"
+ENV PATH="${PATH}:/home/worker/.local/bin"
 RUN pip install --no-cache-dir --no-index --find-links /var/cache/wheels --no-deps -q /src[docker,server]
 
 # Use a custom settings file that can be overwritten
-ENV DJANGO_SETTINGS_MODULE "server.settings_docker"
+ENV DJANGO_SETTINGS_MODULE="server.settings_docker"
 
 WORKDIR /src/server
 
 # Collect staticfiles, including Vue.js build
 RUN python manage.py collectstatic --no-input
 
 # Run with gunicorn, using container's port 80
-ENV PORT 80
+ENV PORT=80
 EXPOSE 80
 CMD ["gunicorn", "--bind", "0.0.0.0:80", "--error-logfile", "-", "--access-logfile", "-", "--capture-output", "server.wsgi"]

README.md

@@ -37,12 +37,12 @@ The server is expected to be run using [`uv`](https://docs.astral.sh/uv/)
 To setup the server, run the following commands:
 
 ```
-$ uv run -p 3.10 --extra=server server/manage.py migrate
+$ uv run -p 3.12 --extra=server server/manage.py migrate
 ```
 
 Create the webcompatmanager user.
 ```
-$ uv run -p 3.10 --extra=server server/manage.py createsuperuser
+$ uv run -p 3.12 --extra=server server/manage.py createsuperuser
 Username (leave blank to use 'user'): webcompatmanager
 Email address: webcompatmanager@internal.com
 Password:
@@ -52,7 +52,7 @@ Superuser created successfully.
 
 It is now possible to run the development server locally:
 ```
-$ uv run -p 3.10 --extra=server server/manage.py runserver
+$ uv run -p 3.12 --extra=server server/manage.py runserver
 ```
 
 Log in using the credentials created above.
@@ -69,7 +69,7 @@ with:
 
 This requires first authenticating with gcloud.
 
-```uv run -p 3.10 --extra=server server/manage.py import_reports_from_bigquery --since <date>```
+```uv run -p 3.12 --extra=server server/manage.py import_reports_from_bigquery --since <date>```
 
 
 ### Important changes in settings.py

conftest.py

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "WebCompatManager"
-requires-python = ">=3.10"
+requires-python = "~=3.12.0"
 authors = [
     {name = "Christian Holler", email = "choller@mozilla.com"},
     {name = "Jesse Schwartzentruber", email = "jschwartzentruber@mozilla.com"},
@@ -28,6 +28,7 @@ dependencies = [
     "jsonpath-ng",
     "jsonschema>=4.18.0",
     "python-dateutil",
+    "setuptools==80.9.0"
 ]
 
 [project.optional-dependencies]
@@ -92,7 +93,7 @@ norecursedirs = [
 
 [tool.ruff]
 fix = true
-target-version = "py310"
+target-version = "py312"
 extend-exclude = ["**/migrations/*.py"]
 
 [tool.ruff.lint]

pyproject.toml

@@ -1,5 +1,5 @@
-import sys
 from datetime import timedelta
+from itertools import batched
 from logging import getLogger
 
 from django.conf import settings
@@ -9,11 +9,6 @@
 
 from reportmanager.models import Bucket, Bug, ReportEntry
 
-if sys.version_info[:2] < (3, 12):
-    from server.utils import batched
-else:
-    from itertools import batched
-
 LOG = getLogger("reportmanager.cleanup_old_reports")
 
 

server/reportmanager/management/commands/cleanup_old_reports.py

@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 import json
 import re
-import sys
 from datetime import timedelta
+from itertools import batched
 from logging import getLogger
 from urllib.parse import urlsplit
 
@@ -27,10 +27,6 @@
 if getattr(settings, "USE_CELERY", None):
     from .tasks import triage_new_report
 
-if sys.version_info[:2] < (3, 12):
-    from server.utils import batched
-else:
-    from itertools import batched
 
 LOG = getLogger("reportmanager")
 

server/reportmanager/models.py

@@ -3,9 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 import html
 import json
-import sys
 from collections import OrderedDict, defaultdict
 from datetime import datetime, timedelta
+from itertools import batched
 from logging import getLogger
 
 from dateutil.relativedelta import relativedelta
@@ -60,11 +60,6 @@
     ReportEntryVueSerializer,
 )
 
-if sys.version_info[:2] < (3, 12):
-    from server.utils import batched
-else:
-    from itertools import batched
-
 LOG = getLogger("reportmanager.views")
 
 

server/reportmanager/views.py

@@ -1,16 +1,10 @@
-import sys
 from contextlib import suppress
 from logging import getLogger
 from time import sleep, time
 from uuid import uuid4
 
 from redis.exceptions import WatchError
 
-if sys.version_info[:2] < (3, 12):
-    from collections.abc import Iterable, Iterator
-    from itertools import islice
-    from typing import TypeVar
-
 LOG = getLogger("webcompatmanager.utils")
 
 
@@ -68,17 +62,3 @@ def release(self):
             "Failed to release lock: %s(%s) != %s", self.name, self.unique_id, existing
         )
         return False
-
-
-if sys.version_info[:2] < (3, 12):
-    # generic type for `batched` below
-    _T = TypeVar("_T")
-
-    # added to itertools in 3.12
-    def batched(iterable: Iterable[_T], n: int) -> Iterator[tuple[_T, ...]]:
-        # batched('ABCDEFG', 3) → ABC DEF G
-        if n < 1:
-            raise ValueError("n must be at least one")
-        iterator = iter(iterable)
-        while batch := tuple(islice(iterator, n)):
-            yield batch

server/server/utils.py

@@ -6,7 +6,7 @@
 import difflib
 import json
 from dataclasses import dataclass, field
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from logging import getLogger
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
@@ -59,9 +59,7 @@ class Report:
     def load(cls, data: str) -> Report:
         result = json.loads(data)
         result["details"] = json.loads(result["details"])
-        result["reported_at"] = isoparse(result["reported_at"]).replace(
-            tzinfo=timezone.utc
-        )
+        result["reported_at"] = isoparse(result["reported_at"]).replace(tzinfo=UTC)
         result["url"] = urlsplit(result["url"])
         return cls(**result)