Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.1
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.11.9
ARG AIRFLOW_UV_VERSION=0.11.11
ARG AIRFLOW_USE_UV="false"
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
ARG AIRFLOW_IMAGE_README_URL="https://github.com/apache/airflow/main/docs/docker-stack/README.md"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -1825,7 +1825,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.1.1
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.11.9
ARG AIRFLOW_UV_VERSION=0.11.11
ARG AIRFLOW_PREK_VERSION="0.3.13"

# UV_LINK_MODE=copy is needed since we are using cache mounted from the host
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[build-system]
requires = [
"gitdb==4.0.12",
"GitPython==3.1.49",
"GitPython==3.1.50",
"hatchling==1.29.0",
"packaging==26.2",
"pathspec==1.1.1",
Expand Down
4 changes: 2 additions & 2 deletions airflow-core/src/airflow/api_fastapi/execution_api/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import time
from contextlib import AsyncExitStack
from functools import cached_property
from typing import TYPE_CHECKING, Any
from typing import TYPE_CHECKING, Any, cast

import attrs
import svcs
Expand Down Expand Up @@ -168,7 +168,7 @@ class CadwynWithOpenAPICustomization(Cadwyn):
# Workaround lack of customzation https://github.com/zmievsa/cadwyn/issues/255
async def openapi_jsons(self, req: Request) -> JSONResponse:
resp = await super().openapi_jsons(req)
open_apischema = json.loads(resp.body)
open_apischema = json.loads(cast("bytes", resp.body))
open_apischema = self.customize_openapi(open_apischema)

resp.body = resp.render(open_apischema)
Expand Down
4 changes: 1 addition & 3 deletions airflow-core/src/airflow/utils/log/file_task_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ def _read(
# If the logs are in legacy format, convert them to a generator of log lines
remote_logs = [
# We don't need to use the log_pos here, as we are using the metadata to track the position
_get_compatible_log_stream(cast("list[str]", logs))
_get_compatible_log_stream(logs)
]
elif isinstance(logs, list) and _is_logs_stream_like(logs[0]):
# If the logs are already in a stream-like format, we can use them directly
Expand Down Expand Up @@ -779,11 +779,9 @@ def read(
out_stream = cast("Generator[StructuredLogMessage, None, None]", out_stream)
return out_stream, metadata
if isinstance(out_stream, list) and isinstance(out_stream[0], StructuredLogMessage):
out_stream = cast("list[StructuredLogMessage]", out_stream)
return (log for log in out_stream), metadata
if isinstance(out_stream, list) and isinstance(out_stream[0], str):
# If the out_stream is a list of strings, convert it to a generator
out_stream = cast("list[str]", out_stream)
raw_stream = _stream_lines_by_chunk(io.StringIO("".join(out_stream)))
out_stream = (log for _, _, log in _log_stream_to_parsed_log_stream(raw_stream))
return out_stream, metadata
Expand Down
7 changes: 4 additions & 3 deletions airflow-core/tests/unit/listeners/asset_listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
from __future__ import annotations

import copy
from typing import Any

from airflow.listeners import hookimpl

changed = []
created = []
emitted = []
changed: list[Any] = []
created: list[Any] = []
emitted: list[Any] = []


@hookimpl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

from airflow.listeners import hookimpl

new = {}
existing = {}
new: dict[str, str] = {}
existing: dict[str, str] = {}


@hookimpl
Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/doc/ci/02_images.md
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ can be used for CI images:
| `ADDITIONAL_DEV_APT_DEPS` | | Additional apt dev dependencies installed in the first part of the image |
| `ADDITIONAL_DEV_APT_ENV` | | Additional env variables defined when installing dev deps |
| `AIRFLOW_PIP_VERSION` | `26.1.1` | `pip` version used. |
| `AIRFLOW_UV_VERSION` | `0.11.9` | `uv` version used. |
| `AIRFLOW_UV_VERSION` | `0.11.11` | `uv` version used. |
| `AIRFLOW_PREK_VERSION` | `0.3.13` | `prek` version used. |
| `AIRFLOW_USE_UV` | `true` | Whether to use UV for installation. |
| `PIP_PROGRESS_BAR` | `on` | Progress bar for PIP installation |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,9 @@ class VersionedFile(NamedTuple):


AIRFLOW_PIP_VERSION = "26.1.1"
AIRFLOW_UV_VERSION = "0.11.9"
AIRFLOW_UV_VERSION = "0.11.11"
AIRFLOW_USE_UV = False
GITPYTHON_VERSION = "3.1.49"
GITPYTHON_VERSION = "3.1.50"
RICH_VERSION = "15.0.0"
PREK_VERSION = "0.3.13"
HATCH_VERSION = "1.16.5"
Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/src/airflow_breeze/global_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb"]

PIP_VERSION = "26.1.1"
UV_VERSION = "0.11.9"
UV_VERSION = "0.11.11"

# packages that providers docs
REGULAR_DOC_PACKAGES = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
Initial version of the provider.
"""

SHORT_HASH_TO_TYPE_DICT = {}
SHORT_HASH_TO_TYPE_DICT: dict[str, TypeOfChange] = {}


class TypeOfChange(Enum):
Expand Down
4 changes: 3 additions & 1 deletion dev/breeze/src/airflow_breeze/utils/functools_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
# under the License.
from __future__ import annotations

cached_functions = []
from typing import Any

cached_functions: list[Any] = []


def clearable_cache(func):
Expand Down
Loading
Loading