2025 poetry lock

.ci/run-safety.sh

@@ -16,19 +16,23 @@
 # 67599: pip issue, utter nonsense
 # 70612: Jinja2 SSTI, as of https://github.com/inducer/relate/pull/1053
 #   there is no longer a direct Jinja dependency, and no known path to SSTI.
-safety check \
-        -i 38678 \
-        -i 39253 \
-        -i 39535 \
-        -i 40291 \
-        -i 44715 \
-        -i 44716 \
-        -i 44717 \
-        -i 51159 \
-        -i 51549 \
-        -i 51499 \
-        -i 51457 \
-        -i 65213 \
-        -i 67599 \
-        -i 70612 \
-        --full-report
+if test "$SAFETY_API_KEY" != ""; then
+        safety --stage cicd --key "$SAFETY_API_KEY" scan \
+                -i 38678 \
+                -i 39253 \
+                -i 39535 \
+                -i 40291 \
+                -i 44715 \
+                -i 44716 \
+                -i 44717 \
+                -i 51159 \
+                -i 51549 \
+                -i 51499 \
+                -i 51457 \
+                -i 65213 \
+                -i 67599 \
+                -i 70612 \
+                --full-report
+else
+        echo ":warning::Skipped running safety, no API key."
+fi

.github/workflows/ci.yml

@@ -52,6 +52,8 @@ jobs:
         run: poetry run ./.ci/run-mypy.sh
       - name: "Safety"
         run: poetry run ./.ci/run-safety.sh
+        env:
+          SAFETY_API_KEY: ${{ secrets.SAFETY_API_KEY }}
       - name: "Sphinx"
         run: |
             (cd doc; poetry run make html SPHINXOPTS="-W --keep-going -n")

course/content.py

@@ -28,6 +28,7 @@
 import os
 import re
 import sys
+from dataclasses import dataclass
 from typing import cast
 from xml.etree.ElementTree import Element, tostring
 
@@ -1195,9 +1196,9 @@ def unknown_decl(self, data):
         self.out_file.write(f"<![{data}]>")
 
 
+@dataclass
 class PreserveFragment:
-    def __init__(self, s: str) -> None:
-        self.s = s
+    s: str
 
 
 class LinkFixerTreeprocessor(Treeprocessor):

course/grades.py

@@ -24,6 +24,7 @@
 """
 
 import re
+from dataclasses import dataclass
 from decimal import Decimal
 from typing import (
     TYPE_CHECKING,
@@ -210,11 +211,10 @@ def view_grading_opportunity_list(pctx):
 
 # {{{ teacher grade book
 
+@dataclass
 class GradeInfo:
-    def __init__(self, opportunity: GradingOpportunity,
-            grade_state_machine: GradeStateMachine) -> None:
-        self.opportunity = opportunity
-        self.grade_state_machine = grade_state_machine
+    opportunity: GradingOpportunity
+    grade_state_machine: GradeStateMachine
 
 
 def get_grade_table(course: Course) -> tuple[

course/page/base.py

@@ -25,6 +25,7 @@
 
 from abc import ABC, abstractmethod
 from collections.abc import Callable, Sequence
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
 
 import django.forms as forms
@@ -97,6 +98,7 @@
 """
 
 
+@dataclass
 class PageContext:
     """
     .. attribute:: course
@@ -113,24 +115,13 @@ class PageContext:
     which is used internally by the flow views.
     """
 
-    def __init__(
-            self,
-            course: Course,
-            repo: Repo_ish,
-            commit_sha: bytes,
-            flow_session: FlowSession,
-            in_sandbox: bool = False,
-            page_uri: str | None = None,
-            request: django.http.HttpRequest | None = None,
-            ) -> None:
-
-        self.course = course
-        self.repo = repo
-        self.commit_sha = commit_sha
-        self.flow_session = flow_session
-        self.in_sandbox = in_sandbox
-        self.page_uri = page_uri
-        self.request = request
+    course: Course
+    repo: Repo_ish
+    commit_sha: bytes
+    flow_session: FlowSession
+    in_sandbox: bool = False
+    page_uri: str | None = None
+    request: django.http.HttpRequest | None = None
 
 
 class PageBehavior:
@@ -194,11 +185,11 @@ def round_point_count_to_quarters(
         return int(value)
 
     import math
-    _atol = atol * 4
+    actual_atol = atol * 4
     v = value * 4
-    if abs(v - math.floor(v)) < _atol:
+    if abs(v - math.floor(v)) < actual_atol:
         v = math.floor(v)
-    elif abs(v - math.ceil(v)) < _atol:
+    elif abs(v - math.ceil(v)) < actual_atol:
         v = math.ceil(v)
     else:
         return value

course/validation.py

@@ -27,6 +27,7 @@
 import re
 import sys
 from collections.abc import Sequence
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Literal, TypeAlias
 
 import dulwich.objects
@@ -226,10 +227,10 @@ def validate_struct(
 # }}}
 
 
+@dataclass
 class ValidationWarning:
-    def __init__(self, location: str | None, text: str) -> None:
-        self.location = location
-        self.text = text
+    location: str | None
+    text: str
 
 
 class ValidationContext:
@@ -1588,10 +1589,10 @@ def tree(self):
         return FileSystemFakeRepoTree(self.root)
 
 
+@dataclass
 class FileSystemFakeRepoTreeEntry:  # pragma: no cover
-    def __init__(self, path: bytes, mode: int) -> None:
-        self.path = path
-        self.mode = mode
+    path: bytes
+    mode: int
 
 
 class FileSystemFakeRepoTree:  # pragma: no cover