Drop Python 3.9 support (#342)

Coming from
#331 (comment)

Airflow dropped support:
- apache/airflow#56734
- apache/airflow#57662

Author: ulgens

.github/workflows/ci.yaml

@@ -23,8 +23,6 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - os: ubuntu-latest
-            python-version: "3.9"
           - os: ubuntu-latest
             python-version: "3.10"
           - os: ubuntu-latest

cadwyn/_utils.py

@@ -18,18 +18,11 @@
     from asyncio import iscoroutinefunction  # noqa: F401
 
 
-if sys.version_info >= (3, 10):
-    UnionType = type(int | str) | type(Union[int, str])
-    DATACLASS_SLOTS: dict[str, Any] = {"slots": True}
-    ZIP_STRICT_TRUE: dict[str, Any] = {"strict": True}
-    ZIP_STRICT_FALSE: dict[str, Any] = {"strict": False}
-    DATACLASS_KW_ONLY: dict[str, Any] = {"kw_only": True}
-else:
-    UnionType = type(Union[int, str])
-    DATACLASS_SLOTS: dict[str, Any] = {}
-    DATACLASS_KW_ONLY: dict[str, Any] = {}
-    ZIP_STRICT_TRUE: dict[str, Any] = {}
-    ZIP_STRICT_FALSE: dict[str, Any] = {}
+UnionType = type(int | str) | type(Union[int, str])
+DATACLASS_SLOTS: dict[str, Any] = {"slots": True}
+ZIP_STRICT_TRUE: dict[str, Any] = {"strict": True}
+ZIP_STRICT_FALSE: dict[str, Any] = {"strict": False}
+DATACLASS_KW_ONLY: dict[str, Any] = {"kw_only": True}
 
 
 def get_name_of_function_wrapped_in_pydantic_validator(func: Any) -> str:

cadwyn/schema_generation.py

@@ -1,10 +1,8 @@
-import ast
 import copy
 import dataclasses
 import functools
 import inspect
 import sys
-import textwrap
 import types
 import typing
 from collections.abc import Callable, Sequence
@@ -297,21 +295,7 @@ def _rebuild_annotated(name: str):
         for name, value in model.__annotations__.items()
     }
 
-    if sys.version_info >= (3, 10):
-        defined_fields = model.__annotations__
-    else:
-        # Before 3.9, pydantic fills model_fields with all fields -- even the ones that were inherited.
-        # So we need to get the list of fields from the AST.
-        try:
-            defined_fields, _ = _get_field_and_validator_names_from_model(model)
-        except OSError:  # pragma: no cover
-            defined_fields = model.model_fields
-        annotations = {
-            name: value
-            for name, value in annotations.items()
-            # We need to filter out fields that were inherited
-            if name not in model.model_fields or name in defined_fields
-        }
+    defined_fields = model.__annotations__
     fields = {
         field_name: PydanticFieldWrapper(
             model.model_fields[field_name],
@@ -346,43 +330,6 @@ def _rebuild_annotated(name: str):
     )
 
 
-@cache
-def _get_field_and_validator_names_from_model(cls: type) -> tuple[set[_FieldName], set[str]]:
-    fields = cls.model_fields
-    source = inspect.getsource(cls)
-    cls_ast = cast("ast.ClassDef", ast.parse(textwrap.dedent(source)).body[0])
-    validator_names = (
-        _get_validator_info_or_none(node)
-        for node in cls_ast.body
-        if isinstance(node, ast.FunctionDef) and node.decorator_list
-    )
-    validator_names = {name for name in validator_names if name is not None}
-
-    return (
-        {
-            node.target.id
-            for node in cls_ast.body
-            if isinstance(node, ast.AnnAssign) and isinstance(node.target, ast.Name) and node.target.id in fields
-        },
-        validator_names,
-    )
-
-
-def _get_validator_info_or_none(method: ast.FunctionDef) -> Union[str, None]:
-    for decorator in method.decorator_list:
-        # The cases we handle here:
-        # * `Name(id="root_validator")`
-        # * `Call(func=Name(id="validator"), args=[Constant(value="foo")])`
-        # * `Attribute(value=Name(id="pydantic"), attr="root_validator")`
-        # * `Call(func=Attribute(value=Name(id="pydantic"), attr="root_validator"), args=[])`
-
-        if (isinstance(decorator, ast.Call) and ast.unparse(decorator.func).endswith("validator")) or (
-            isinstance(decorator, (ast.Name, ast.Attribute)) and ast.unparse(decorator).endswith("validator")
-        ):
-            return method.name
-    return None
-
-
 @final
 @dataclasses.dataclass(**DATACLASS_SLOTS)
 class _PydanticModelWrapper(Generic[_T_PYDANTIC_MODEL]):

pyproject.toml

@@ -5,7 +5,7 @@ description = "Production-ready community-driven modern Stripe-like API versioni
 authors = [{ name = "Stanislav Zmiev", email = "zmievsa@gmail.com" }]
 license = "MIT"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 keywords = [
     "python",
     "api",
@@ -29,7 +29,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",

tests/test_render.py

@@ -26,12 +26,8 @@ def test__render_model__with_weird_types():
     else:
         rend_ann = "Annotated"
 
-    if sys.version_info >= (3, 10):
-        rend_len = "Len(min_length=0, max_length=None)"
-        rend_interval = "Interval(gt=12, ge=None, lt=None, le=None)"
-    else:
-        rend_len = "Len()"
-        rend_interval = "Interval(gt=12)"
+    rend_len = "Len(min_length=0, max_length=None)"
+    rend_interval = "Interval(gt=12, ge=None, lt=None, le=None)"
 
     # TODO: As you see, we do not rename bases correctly in render. We gotta fix it some day...
     assert code(result) == code(

tests/test_router_generation_with_from_future_annotations.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-import sys
 from typing import Annotated
 
-import pytest
 from fastapi import Depends, Request
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field, WithJsonSchema
@@ -80,10 +78,6 @@ async def __call__(self, request: Request) -> None:
         pass
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 10),
-    reason="FastAPI doesn't properly resolve Request forward refs in callable class dependencies on Python 3.9",
-)
 def test__router_generation__using_callable_class_dependency_with_forwardref():
     """Test that callable class instances work as dependencies with future annotations.
 

tox.ini

@@ -4,7 +4,7 @@ envlist =
     # When updating Python versions, use search-and-replace
     # against the entire list of of versions
     # to ensure consistency throughout this file.
-    py{3.13, 3.12, 3.11, 3.10, 3.9}
+    py{3.13, 3.12, 3.11, 3.10}
     coverage_report
     docs
     pyright
@@ -18,7 +18,7 @@ extras =
 package = wheel
 wheel_build_env = build_wheel
 depends =
-    py{3.13, 3.12, 3.11, 3.10, 3.9}: coverage_erase
+    py{3.13, 3.12, 3.11, 3.10}: coverage_erase
 commands = coverage run -m pytest {posargs}
 
 
@@ -30,7 +30,7 @@ commands = coverage erase
 [testenv:coverage_report]
 skip_install = true
 depends =
-    py{3.13, 3.12, 3.11, 3.10, 3.9}
+    py{3.13, 3.12, 3.11, 3.10}
 commands_pre =
     # Ignore the exit code of `coverage combine`
     # (in case the reports are already combined).