From 5e510d8212bbef9f2d4418ec8dc03fd71ab7ec6a Mon Sep 17 00:00:00 2001
From: Miguel Grinberg <miguel.grinberg@gmail.com>
Date: Wed, 15 Oct 2025 12:38:46 +0100
Subject: [PATCH] Add 3.14 to CI builds (#3103)

* Add 3.14 to CI builds

* Support Python 3.14 __annotate_func__

* Temporarily remove pyarrow

* Update pyproject.toml

Co-authored-by: Quentin Pradet <quentin.pradet@gmail.com>

* cleanup annotationlib use

---------

Co-authored-by: Quentin Pradet <quentin.pradet@gmail.com>
(cherry picked from commit 1f43ab95f1a863f0f58b5818f272911d89060d3f)
---
 .buildkite/Dockerfile              |  2 +-
 .buildkite/pipeline.yml            |  5 +++--
 .buildkite/run-tests               |  2 +-
 .github/workflows/ci.yml           |  2 +-
 elasticsearch/dsl/document_base.py | 15 +++++++++++++++
 noxfile.py                         |  4 ++--
 pyproject.toml                     |  2 +-
 7 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.buildkite/Dockerfile b/.buildkite/Dockerfile
index a68ad997d..2c6bfbe6c 100644
--- a/.buildkite/Dockerfile
+++ b/.buildkite/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.13
+ARG PYTHON_VERSION=3.14
 FROM python:${PYTHON_VERSION}
 
 # Default UID/GID to 1000
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ac7c6b60a..729336bac 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -16,6 +16,7 @@ steps:
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
         connection:
           - "urllib3"
           - "requests"
@@ -23,11 +24,11 @@ steps:
           - "test"
       adjustments:
         - with:
-            python: "3.9"
+            python: "3.10"
             connection: "urllib3"
             nox_session: "test_otel"
         - with:
-            python: "3.13"
+            python: "3.14"
             connection: "urllib3"
             nox_session: "test_otel"
     command: ./.buildkite/run-tests
diff --git a/.buildkite/run-tests b/.buildkite/run-tests
index 90a95a209..8d0eb7ffd 100755
--- a/.buildkite/run-tests
+++ b/.buildkite/run-tests
@@ -7,7 +7,7 @@
 # Default environment variables
 export STACK_VERSION="${STACK_VERSION:=8.0.0-SNAPSHOT}"
 export TEST_SUITE="${TEST_SUITE:=platinum}"
-export PYTHON_VERSION="${PYTHON_VERSION:=3.13}"
+export PYTHON_VERSION="${PYTHON_VERSION:=3.14}"
 export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=urllib3}"
 
 script_path=$(dirname $(realpath $0))
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b335bfac0..20663c601 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
         nox-session: [""]
         runs-on: ["ubuntu-latest"]
 
diff --git a/elasticsearch/dsl/document_base.py b/elasticsearch/dsl/document_base.py
index 4df900a39..72f0364a4 100644
--- a/elasticsearch/dsl/document_base.py
+++ b/elasticsearch/dsl/document_base.py
@@ -34,6 +34,11 @@
     overload,
 )
 
+try:
+    import annotationlib
+except ImportError:
+    annotationlib = None
+
 try:
     from types import UnionType
 except ImportError:
@@ -332,6 +337,16 @@ def __init__(self, name: str, bases: Tuple[type, ...], attrs: Dict[str, Any]):
         #     # ignore attributes
         #     field10: ClassVar[string] = "a regular class variable"
         annotations = attrs.get("__annotations__", {})
+        if not annotations and annotationlib:
+            # Python 3.14+ uses annotationlib
+            annotate = annotationlib.get_annotate_from_class_namespace(attrs)
+            if annotate:
+                annotations = (
+                    annotationlib.call_annotate_function(
+                        annotate, format=annotationlib.Format.VALUE
+                    )
+                    or {}
+                )
         fields = {n for n in attrs if isinstance(attrs[n], Field)}
         fields.update(annotations.keys())
         field_defaults = {}
diff --git a/noxfile.py b/noxfile.py
index d5a6099e7..01de5e4b4 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -44,14 +44,14 @@ def pytest_argv():
     ]
 
 
-@nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13"])
+@nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"])
 def test(session):
     session.install("-e", ".[dev]", env=INSTALL_ENV, silent=False)
 
     session.run(*pytest_argv(), *session.posargs)
 
 
-@nox.session(python=["3.9", "3.13"])
+@nox.session(python=["3.10", "3.14"])
 def test_otel(session):
     session.install(
         ".[dev]",
diff --git a/pyproject.toml b/pyproject.toml
index a8e5ead9e..6b4915106 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -73,7 +73,7 @@ dev = [
     "orjson",
     "numpy",
     "simsimd",
-    "pyarrow",
+    "pyarrow; python_version<'3.14'",
     "pandas",
     "mapbox-vector-tile",
     "jinja2",