apache · bugraoz93 · May 26, 2026 · Apr 26, 2026 · Apr 26, 2026 · Apr 27, 2026
@@ -128,6 +128,10 @@ jobs:
         run: >
           breeze release-management prepare-task-sdk-distributions
           --distribution-format ${{ matrix.package-format }}
+      - name: "Prepare airflow-ctl package: ${{ matrix.package-format }}"
+        run: >
+          breeze release-management prepare-airflow-ctl-distributions
+          --distribution-format ${{ matrix.package-format }}
       - name: "Verify ${{ matrix.package-format }} packages with twine"
         run: |
           uv tool uninstall twine || true

@@ -73,7 +73,7 @@ ARG PYTHON_LTO="true"
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=26.0.1
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.11.7
+ARG AIRFLOW_UV_VERSION=0.11.8
 ARG AIRFLOW_USE_UV="false"
 ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
 ARG AIRFLOW_IMAGE_README_URL="https://raw.githubusercontent.com/apache/airflow/main/docs/docker-stack/README.md"
@@ -1067,8 +1067,11 @@ function install_airflow_and_providers_from_docker_context_files(){
         install_airflow_core_distribution=("apache-airflow-core==${AIRFLOW_VERSION}")
     fi
 
-    # Find Provider/TaskSDK/CTL distributions in docker-context files
-    readarray -t airflow_distributions< <(python /scripts/docker/get_distribution_specs.py /docker-context-files/apache?airflow?{providers,task?sdk,airflowctl}*.{whl,tar.gz} 2>/dev/null || true)
+    # Find Provider/TaskSDK/CTL distributions in docker-context files.
+    # NOTE: the ctl wheel is named ``apache_airflow_ctl-*.whl`` (distribution
+    # ``apache-airflow-ctl``), not ``apache_airflow_airflowctl-*.whl`` — the
+    # glob must say ``ctl``, not ``airflowctl``.
+    readarray -t airflow_distributions< <(python /scripts/docker/get_distribution_specs.py /docker-context-files/apache?airflow?{providers,task?sdk,ctl}*.{whl,tar.gz} 2>/dev/null || true)
     echo
     echo "${COLOR_BLUE}Found provider distributions in docker-context-files folder: ${airflow_distributions[*]}${COLOR_RESET}"
     echo

@@ -1828,7 +1828,7 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=26.0.1
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.11.7
+ARG AIRFLOW_UV_VERSION=0.11.8
 ARG AIRFLOW_PREK_VERSION="0.3.9"
 
 # UV_LINK_MODE=copy is needed since we are using cache mounted from the host

diff --git a/airflow-core/pyproject.toml b/airflow-core/pyproject.toml
@@ -18,14 +18,14 @@
 [build-system]
 requires = [
     "gitdb==4.0.12",
-    "GitPython==3.1.46",
+    "GitPython==3.1.50",
     "hatchling==1.29.0",
-    "packaging==26.1",
-    "pathspec==1.0.4",
+    "packaging==26.2",
+    "pathspec==1.1.1",
     "pluggy==1.6.0",
     "smmap==5.0.3",
     "tomli==2.4.1; python_version < '3.11'",
-    "trove-classifiers==2026.1.14.14",
+    "trove-classifiers==2026.5.7.17",
 ]
 build-backend = "hatchling.build"
 
@@ -64,10 +64,11 @@ classifiers = [
 ]
 
 # Version is defined in src/airflow/__init__.py and it is automatically synchronized by prek hook
-version = "3.2.1"
+version = "3.3.0"
 
 dependencies = [
     "a2wsgi>=1.10.8",
+    "cachetools>=6.0.0",
     # aiosqlite 0.22.0 has a problem with hanging pytest sessions and we excluded it
     # See https://github.com/omnilib/aiosqlite/issues/369
     # It seems that while our test issues are fixed in 0.22.1, sqlalchemy 2 itself
@@ -96,9 +97,7 @@ dependencies = [
     "dill>=0.2.2",
     "fastapi[standard-no-fastapi-cloud-cli]>=0.129.0",
     "uvicorn>=0.37.0",
-    # Starlette 1.0.0 breaks the API server. Needs more investigation
-    # https://github.com/apache/airflow/issues/64116
-    "starlette>=0.45.0,<1",
+    "starlette>=0.45.0",
     "httpx>=0.25.0",
     'importlib_metadata>=6.5;python_version<"3.12"',
     'importlib_metadata>=7.0;python_version>="3.12"',
@@ -148,10 +147,10 @@ dependencies = [
     "tenacity>=8.3.0",
     "termcolor>=3.0.0",
     "typing-extensions>=4.14.1",
-    # https://github.com/apache/airflow/issues/56369 , rework universal-pathlib usage
     "universal-pathlib>=0.3.8",
     "uuid6>=2024.7.10",
-    "apache-airflow-task-sdk==1.2.1",
+    "apache-airflow-task-sdk<1.4.0,>=1.3.0",
+    "apache-airflow-ctl<0.1.6,>=0.1.5",
     # pre-installed providers
     "apache-airflow-providers-common-compat>=1.7.4",
     "apache-airflow-providers-common-io>=1.6.3",
@@ -249,6 +248,7 @@ exclude = [
 "../shared/secrets_backend/src/airflow_shared/secrets_backend" = "src/airflow/_shared/secrets_backend"
 "../shared/secrets_masker/src/airflow_shared/secrets_masker" = "src/airflow/_shared/secrets_masker"
 "../shared/serialization/src/airflow_shared/serialization" = "src/airflow/_shared/serialization"
+"../shared/state/src/airflow_shared/state" = "src/airflow/_shared/state"
 "../shared/timezones/src/airflow_shared/timezones" = "src/airflow/_shared/timezones"
 "../shared/listeners/src/airflow_shared/listeners" = "src/airflow/_shared/listeners"
 "../shared/plugins_manager/src/airflow_shared/plugins_manager" = "src/airflow/_shared/plugins_manager"
@@ -285,6 +285,7 @@ dev = [
     "apache-airflow-core[all]",
     "apache-airflow-ctl",
     "apache-airflow-devel-common",
+    "apache-airflow-task-sdk",
     # TODO(potiuk): eventually we do not want any providers nor apache-airflow extras to be needed for
     # airflow-core tests
     "apache-airflow[pandas,polars]",
@@ -311,13 +312,18 @@ dev = [
 docs = [
     "apache-airflow-devel-common[docs]"
 ]
+mypy = [
+    "apache-airflow-devel-common[mypy]",
+]
+
 
 
 [tool.uv]
-required-version = ">=0.6.3"
+required-version = ">=0.11.8"
 
 [tool.uv.sources]
 apache-airflow-core = {workspace = true}
+apache-airflow-ctl = {workspace = true}
 apache-airflow-devel-common = { workspace = true }
 
 [tool.airflow]
@@ -331,6 +337,7 @@ shared_distributions = [
     "apache-airflow-shared-secrets-backend",
     "apache-airflow-shared-secrets-masker",
     "apache-airflow-shared-serialization",
+    "apache-airflow-shared-state",
     "apache-airflow-shared-timezones",
     "apache-airflow-shared-plugins-manager",
     "apache-airflow-shared-providers-discovery",

@@ -34,7 +34,7 @@
 
 
 class DagScheduleAssetReference(StrictBaseModel):
-    """DAG schedule reference serializer for assets."""
+    """Dag schedule reference serializer for assets."""
 
     dag_id: str
     created_at: datetime

@@ -36,22 +36,22 @@
 
 
 class DAGRunPatchStates(str, Enum):
-    """Enum for DAG Run states when updating a DAG Run."""
+    """Enum for Dag Run states when updating a Dag Run."""
 
     QUEUED = DagRunState.QUEUED
     SUCCESS = DagRunState.SUCCESS
     FAILED = DagRunState.FAILED
 
 
 class DAGRunPatchBody(StrictBaseModel):
-    """DAG Run Serializer for PATCH requests."""
+    """Dag Run Serializer for PATCH requests."""
 
     state: DAGRunPatchStates | None = None
     note: str | None = Field(None, max_length=1000)
 
 
 class DAGRunClearBody(StrictBaseModel):
-    """DAG Run serializer for clear endpoint body."""
+    """Dag Run serializer for clear endpoint body."""
 
     dry_run: bool = True
     only_failed: bool = False
@@ -62,7 +62,7 @@ class DAGRunClearBody(StrictBaseModel):
 
 
 class DAGRunResponse(BaseModel):
-    """DAG Run serializer for responses."""
+    """Dag Run serializer for responses."""
 
     dag_run_id: str = Field(validation_alias="run_id")
     dag_id: str
@@ -88,14 +88,14 @@ class DAGRunResponse(BaseModel):
 
 
 class DAGRunCollectionResponse(BaseModel):
-    """DAG Run Collection serializer for responses."""
+    """Dag Run Collection serializer for responses."""
 
     dag_runs: Iterable[DAGRunResponse]
     total_entries: int
 
 
 class TriggerDAGRunPostBody(StrictBaseModel):
-    """Trigger DAG Run Serializer for POST body."""
+    """Trigger Dag Run Serializer for POST body."""
 
     dag_run_id: str | None = None
     data_interval_start: AwareDatetime | None = None
@@ -145,7 +145,7 @@ def validate_context(self, dag: SerializedDAG) -> dict:
 
 
 class DAGRunsBatchBody(StrictBaseModel):
-    """List DAG Runs body for batch endpoint."""
+    """List Dag Runs body for batch endpoint."""
 
     order_by: str | None = None
     page_offset: NonNegativeInt = 0

@@ -22,7 +22,7 @@
 
 
 class DAGSourceResponse(BaseModel):
-    """DAG Source serializer for responses."""
+    """Dag Source serializer for responses."""
 
     content: str | None
     dag_id: str

@@ -31,15 +31,15 @@ class DagStatsStateResponse(BaseModel):
 
 
 class DagStatsResponse(BaseModel):
-    """DAG Stats serializer for responses."""
+    """Dag Stats serializer for responses."""
 
     dag_id: str
     dag_display_name: str = Field(validation_alias=AliasPath("dag_model", "dag_display_name"))
     stats: list[DagStatsStateResponse]
 
 
 class DagStatsCollectionResponse(BaseModel):
-    """DAG Stats Collection serializer for responses."""
+    """Dag Stats Collection serializer for responses."""
 
     dags: list[DagStatsResponse]
     total_entries: int
@@ -23,15 +23,15 @@
 
 
 class DagTagResponse(BaseModel):
-    """DAG Tag serializer for responses."""
+    """Dag Tag serializer for responses."""
 
     name: str
     dag_id: str
     dag_display_name: str = Field(validation_alias=AliasPath("dag", "dag_display_name"))
 
 
 class DAGTagCollectionResponse(BaseModel):
-    """DAG Tags Collection serializer for responses."""
+    """Dag Tags Collection serializer for responses."""
 
     tags: list[str]
     total_entries: int
@@ -40,7 +40,7 @@ class DagVersionResponse(BaseModel):
 
 
 class DAGVersionCollectionResponse(BaseModel):
-    """DAG Version Collection serializer for responses."""
+    """Dag Version Collection serializer for responses."""
 
     dag_versions: Iterable[DagVersionResponse]
     total_entries: int
@@ -27,7 +27,7 @@
 
 
 class DAGWarningResponse(BaseModel):
-    """DAG Warning serializer for responses."""
+    """Dag Warning serializer for responses."""
 
     dag_id: str
     warning_type: DagWarningType
@@ -37,7 +37,7 @@ class DAGWarningResponse(BaseModel):
 
 
 class DAGWarningCollectionResponse(BaseModel):
-    """DAG warning collection serializer for responses."""
+    """Dag warning collection serializer for responses."""
 
     dag_warnings: Iterable[DAGWarningResponse]
     total_entries: int
@@ -66,7 +66,7 @@ def _get_file_token_serializer() -> URLSafeSerializer:
 
 
 class DAGResponse(BaseModel):
-    """DAG serializer for responses."""
+    """Dag serializer for responses."""
 
     model_config = ConfigDict(
         alias_generator=AliasGenerator(
@@ -110,7 +110,7 @@ def serialize_tags(self, tags: list[DagTagResponse]) -> list[DagTagResponse]:
     @field_validator("owners", mode="before")
     @classmethod
     def get_owners(cls, v: Any) -> list[str] | None:
-        """Convert owners attribute to DAG representation."""
+        """Convert owners attribute to Dag representation."""
         if not (v is None or isinstance(v, str)):
             return v
 
@@ -150,14 +150,14 @@ class DAGPatchBody(StrictBaseModel):
 
 
 class DAGCollectionResponse(BaseModel):
-    """DAG Collection serializer for responses."""
+    """Dag Collection serializer for responses."""
 
     dags: Iterable[DAGResponse]
     total_entries: int
 
 
 class DAGDetailsResponse(DAGResponse):
-    """Specific serializer for DAG Details responses."""
+    """Specific serializer for Dag Details responses."""
 
     model_config = ConfigDict(
         from_attributes=True,

@@ -2052,7 +2052,7 @@ components:
       - dag_id
       - dag_display_name
       title: DagTagResponse
-      description: DAG Tag serializer for responses.
+      description: Dag Tag serializer for responses.
     DagVersionResponse:
       properties:
         id: