MPP-3487: Update to Python 3.11.10, prepare for Python 3.12, 3.13

.circleci/config.yml

@@ -681,11 +681,18 @@ workflows:
 
       - python_job:
           name: python 3.12 test
-          python_version: "3.12"
+          python_version: "3.12.7"
           command: pytest
-          pytest_fail_fast: true
           test_results_filename: pytest-python-3-12.xml
+          filters: *default_filters
+
+      - python_job:
+          name: python 3.13 test
+          command: pytest
+          pytest_fail_fast: true
+          python_version: "3.13"
           allow_fail: true
+          test_results_filename: pytest-python-3-13.xml
           filters: *default_filters
 
       - python_job:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11.8
+FROM python:3.11.10
 
 ARG CIRCLE_BRANCH
 ARG CIRCLE_SHA1

api/tests/emails_views_tests.py

@@ -787,8 +787,11 @@ def test_first_forwarded_email_unknown_mask(free_api_client: APIClient) -> None:
 
 
 def test_first_forwarded_email_success(
-    free_api_client: APIClient, free_user: User
+    free_api_client: APIClient,
+    free_user: User,
+    settings: SettingsWrapper,
 ) -> None:
+    settings.RELAY_FROM_ADDRESS = "[email protected]"
     address = free_user.relayaddress_set.create()
     with (
         override_flag("free_user_onboarding", True),

docs/developer_mode.md

@@ -173,6 +173,6 @@ joined by whitespace, such as newlines, before sending it to
 
 [Ascii85]: https://en.wikipedia.org/wiki/Ascii85
 [MozLog format]: https://wiki.mozilla.org/Firefox/Services/Logging#MozLog_application_logging_standard
-[base64.a85encode]: https://docs.python.org/3.11/library/base64.html#base64.a85encode
+[base64.a85encode]: https://docs.python.org/3/library/base64.html#base64.a85encode
 [zlib.compress]: https://docs.python.org/3/library/zlib.html
 [zlib]: https://docs.python.org/3/library/zlib.html

emails/utils.py

@@ -8,7 +8,7 @@
 import re
 import zlib
 from collections.abc import Callable
-from email.errors import InvalidHeaderDefect
+from email.errors import HeaderParseError, InvalidHeaderDefect
 from email.headerregistry import Address, AddressHeader
 from email.message import EmailMessage
 from email.utils import formataddr, parseaddr
@@ -301,7 +301,7 @@ def generate_from_header(original_from_address: str, relay_mask: str) -> str:
     display_name, original_address = parseaddr(oneline_from_address)
     try:
         parsed_address = Address(addr_spec=original_address)
-    except (InvalidHeaderDefect, IndexError) as e:
+    except (InvalidHeaderDefect, IndexError, HeaderParseError) as e:
         # TODO: MPP-3407, MPP-3417 - Determine how to handle these
         raise InvalidFromHeader from e
 

requirements.txt

@@ -19,7 +19,7 @@ dockerflow==2024.4.2
 drf-spectacular==0.27.2
 drf-spectacular-sidecar==2024.7.1
 glean_parser==15.2.0
-google-cloud-profiler==4.1.0
+google-cloud-profiler==4.1.0; python_version < '3.13'
 google-cloud-sqlcommenter==2.0.0; python_version < '3.12'
 gunicorn==23.0.0
 jwcrypto==1.5.6

runtime.txt

@@ -1 +1 @@
-python-3.11.8
+python-3.11.10