Drop support for Python 3.9

Ref. eng/recordflux/RecordFlux#1424

Author: treiher

.gitlab-ci.yml

@@ -341,7 +341,6 @@ python_compatibility:
   parallel:
     matrix:
       - PYTHON_VERSION:
-        - "3.9"
         - "3.10"
         - "3.12"
   script:
@@ -676,7 +675,6 @@ installation_from_pypi:
   parallel:
     matrix:
       - PYTHON_VERSION:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
@@ -698,7 +696,6 @@ installation_from_testpypi:
   parallel:
     matrix:
       - PYTHON_VERSION:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Display of message graphs in VS Code (AdaCore/RecordFlux#1307, eng/recordflux/RecordFlux#1838)
 - Validity of null messages in PyRFLX (eng/recordflux/RecordFlux#1841)
 
+### Removed
+
+- Support for Python 3.9 (eng/recordflux/RecordFlux#1424)
+
 ## [0.26.0] - 2024-12-18
 
 ### Added

Makefile

@@ -11,7 +11,7 @@ GNATCOLL_ORIGIN ?= https://github.com/AdaCore
 LANGKIT_ORIGIN ?= https://github.com/AdaCore
 ADASAT_ORIGIN ?= https://github.com/AdaCore
 VERSION ?= $(shell test -f pyproject.toml && test -f $(POETRY) && $(POETRY) version -s)
-PYTHON_VERSIONS ?= 3.9 3.10 3.11 3.12
+PYTHON_VERSIONS ?= 3.10 3.11 3.12
 CARGO_HOME ?= $(MAKEFILE_DIR)/.cargo-home
 NO_GIT_CHECKOUT ?=
 CHECK_VENV_FULL_SYNC ?=
@@ -45,7 +45,7 @@ GNATCOLL_DIR = contrib/gnatcoll-bindings
 LANGKIT_DIR = contrib/langkit
 ADASAT_DIR = contrib/adasat
 
-DEVUTILS_HEAD = 4e878cc2b2224a2ff6b24ac1f9210c2b307af25b
+DEVUTILS_HEAD = 652d5c611df3790fafddf25780b6f473f3465f94
 GNATCOLL_HEAD = f988b2052d01310b830d63e86e19c8dc77d382a2
 LANGKIT_HEAD = 07218ed24a932e747b98416ceae74e1620276ecc
 ADASAT_HEAD = f20d814a4b26508d0dd6ee48a92bc560b122dad5

doc/user_guide/10-introduction.rst

@@ -142,7 +142,6 @@ If FSF GNAT is used, the `GNATcoll iconv binding <https://docs.adacore.com/live/
 
 To run RecordFlux one of the following Python versions is needed:
 
--  Python 3.9
 -  Python 3.10
 -  Python 3.11
 -  Python 3.12

examples/apps/wireguard/handlers.py

@@ -5,7 +5,7 @@
 import os
 from collections.abc import Callable
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from rflx.model import NeverVerify
 from rflx.pyrflx import MessageValue, PyRFLX
@@ -40,7 +40,7 @@ class Connection:
     packet_counter: int = 0
 
 
-HandlerType = Callable[[Connection, MessageValue], Optional[bytes]]
+HandlerType = Callable[[Connection, MessageValue], bytes | None]
 
 
 def _create_transport_data_message(conn: Connection, clear_data: bytes) -> bytes:

examples/apps/wireguard/tai64_bindings/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "tai64_bindings"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",

examples/specs/checksum.py

@@ -1,12 +1,17 @@
+# noqa: INP001
+
+
 def icmp_checksum(message: bytes, **kwargs: object) -> int:
     first_arg = kwargs.get("Tag'First .. Checksum'First - 1")
     assert isinstance(first_arg, tuple)
     tag_first, checksum_first_minus_one = first_arg
-    assert tag_first == 0 and checksum_first_minus_one == 15
+    assert tag_first == 0
+    assert checksum_first_minus_one == 15
     second_arg = kwargs.get("Checksum'Last + 1 .. Message'Last")
     assert isinstance(second_arg, tuple)
     checksum_last_plus_one, data_last = second_arg
-    assert checksum_last_plus_one == 32 and data_last == 511
+    assert checksum_last_plus_one == 32
+    assert data_last == 511
 
     checksum_bytes = message[tag_first : (checksum_first_minus_one + 1) // 8]
     checksum_bytes += b"\x00" * 2
@@ -18,7 +23,8 @@ def ip_header_checksum(message: bytes, **kwargs: object) -> int:
     first_arg = kwargs.get("Version'First .. Header_Checksum'First - 1")
     assert isinstance(first_arg, tuple)
     version_first, checksum_first_minus_one = first_arg
-    assert version_first == 0 and checksum_first_minus_one == 79
+    assert version_first == 0
+    assert checksum_first_minus_one == 79
     second_arg = kwargs.get("Header_Checksum'Last + 1 .. Payload'First - 1")
     assert isinstance(second_arg, tuple)
     checksum_last_plus_one, options_last = second_arg
@@ -42,7 +48,8 @@ def add_ones_complement(num1: int, num2: int) -> int:
     intermediary_result = message_in_sixteen_bit_chunks[0]
     for i in range(1, len(message_in_sixteen_bit_chunks)):
         intermediary_result = add_ones_complement(
-            intermediary_result, message_in_sixteen_bit_chunks[i]
+            intermediary_result,
+            message_in_sixteen_bit_chunks[i],
         )
 
     return intermediary_result ^ 0xFFFF

poetry.lock

@@ -18,7 +18,6 @@ classifiers = [
     "Programming Language :: Ada",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -70,7 +69,7 @@ script = "build.py"
 generate-setup-file = true
 
 [tool.poetry.dependencies]
-python = ">=3.9.2, <4"
+python = ">=3.10, <4"
 attrs = ">=22.1, <24"
 defusedxml = ">=0.7, <0.8"
 lark = ">=1.1.8, <2"

pyproject.toml.in

@@ -1571,7 +1571,7 @@ def __init__(
         self.identifier = ID(identifier)
         self.generic_package = ID(generic_package)
         self.associations: list[tuple[ID | None, Expr]] = [
-            (ID(i) if i else None, Variable(e) if isinstance(e, (str, ID)) else e)
+            (ID(i) if i else None, Variable(e) if isinstance(e, str | ID) else e)
             for i, e in associations or []
         ]
 
@@ -2036,7 +2036,7 @@ def __str__(self) -> str:
             if (
                 self.identifier.ada_str == "Assert"
                 and len(self.pragma_parameters) == 1
-                and isinstance(self.pragma_parameters[0], (IfExpr, CaseExpr))
+                and isinstance(self.pragma_parameters[0], IfExpr | CaseExpr)
             ):
                 parameters = f" {parameters}"
             else:
@@ -2579,7 +2579,7 @@ def __str__(self) -> str:
             if (
                 self.identifier.ada_str == "Assert"
                 and len(self.pragma_parameters) == 1
-                and isinstance(self.pragma_parameters[0], (IfExpr, CaseExpr))
+                and isinstance(self.pragma_parameters[0], IfExpr | CaseExpr)
             ):
                 parameters = f" {parameters}"
             else:
@@ -2637,7 +2637,7 @@ def __init__(
         self.formal_parameters = formal_parameters
 
     def __iadd__(self, other: object) -> Self:
-        if isinstance(other, (UnitPart, SubprogramUnitPart)):
+        if isinstance(other, UnitPart | SubprogramUnitPart):
             self.declaration.declarations = [*self.declaration.declarations, *other.specification]
             self.declaration.private_declarations = [
                 *self.declaration.private_declarations,