Merge branch 'main' into flow-external-resources

inducer · Nov 20, 2024 · c83d0d0 · c83d0d0
2 parents 2c2522d + 209e54c
commit c83d0d0
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 97 deletions.
diff --git a/course/utils.py b/course/utils.py
@@ -1224,8 +1224,7 @@ def csv_data_importable(file_contents, column_idx_list, header_count):
     return True, ""
 
 
-def will_use_masked_profile_for_email(
-        recipient_email: None | str | list[str]) -> bool:
+def will_use_masked_profile_for_email(recipient_email: str | list[str] | None) -> bool:
     if not recipient_email:
         return False
     if not isinstance(recipient_email, list):

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "@benrbray/prosemirror-math": "^1.0.0",
-    "@codemirror/autocomplete": "^6.18.1",
+    "@codemirror/autocomplete": "^6.18.3",
     "@codemirror/commands": "^6.7.1",
     "@codemirror/lang-markdown": "^6.2.0",
     "@codemirror/lang-python": "^6.1.6",
@@ -51,7 +51,7 @@
     "sass": "https://github.com/twbs/bootstrap/issues/40849"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-replace": "^6.0.1",
     "@rollup/plugin-terser": "^0.4.4",

diff --git a/poetry.lock b/poetry.lock
diff --git a/prairietest/utils.py b/prairietest/utils.py
@@ -129,7 +129,7 @@ def has_access_to_exam(
             exam_uuid: str,
             now: datetime,
             ip_address: IPv4Address | IPv6Address
-        ) -> None | AllowEvent:
+        ) -> AllowEvent | None:
     facility_id_to_most_recent_allow_event: dict[int, AllowEvent] = {}
     for allow_event in AllowEvent.objects.filter(
                 facility__course=course,