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 .github/actions/breeze/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ inputs:
default: "3.10"
uv-version:
description: 'uv version to use'
default: "0.10.12" # Keep this comment to allow automatic replacement of uv version
default: "0.11.1" # Keep this comment to allow automatic replacement of uv version
outputs:
host-python-version:
description: Python version used in host
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/install-prek/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ inputs:
default: "3.10"
uv-version:
description: 'uv version to use'
default: "0.10.12" # Keep this comment to allow automatic replacement of uv version
default: "0.11.1" # Keep this comment to allow automatic replacement of uv version
prek-version:
description: 'prek version to use'
default: "0.3.6" # Keep this comment to allow automatic replacement of prek version
default: "0.3.8" # Keep this comment to allow automatic replacement of prek version
save-cache:
description: "Whether to save prek cache"
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/basic-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ on: # yamllint disable-line rule:truthy
type: string
uv-version:
description: 'uv version to use'
default: "0.10.12" # Keep this comment to allow automatic replacement of uv version
default: "0.11.1" # Keep this comment to allow automatic replacement of uv version
type: string
platform:
description: 'Platform for the build - linux/amd64 or linux/arm64'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-amd-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_USERNAME: ${{ github.actor }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
UV_VERSION: "0.10.12" # Keep this comment to allow automatic replacement of uv version
UV_VERSION: "0.11.1" # Keep this comment to allow automatic replacement of uv version
VERBOSE: "true"

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_dockerhub_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
AIRFLOW_VERSION: ${{ github.event.inputs.airflowVersion }}
AMD_ONLY: ${{ github.event.inputs.amdOnly }}
LIMIT_PYTHON_VERSIONS: ${{ github.event.inputs.limitPythonVersions }}
UV_VERSION: "0.10.12" # Keep this comment to allow automatic replacement of uv version
UV_VERSION: "0.11.1" # Keep this comment to allow automatic replacement of uv version
if: contains(fromJSON('[
"ashb",
"bugraoz93",
Expand Down
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.0.1
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.10.12
ARG AIRFLOW_UV_VERSION=0.11.1
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"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -1683,7 +1683,7 @@ RUN SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]') \
&& chmod +x /usr/local/bin/helm

# Install mprocs - a modern process manager for managing multiple Airflow components
ARG MPROCS_VERSION="0.8.3"
ARG MPROCS_VERSION="0.9.2"

RUN SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]') \
&& PLATFORM="$(uname -m)" \
Expand Down Expand Up @@ -1777,8 +1777,8 @@ 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.10.12
ARG AIRFLOW_PREK_VERSION="0.3.6"
ARG AIRFLOW_UV_VERSION=0.11.1
ARG AIRFLOW_PREK_VERSION="0.3.8"

# UV_LINK_MODE=copy is needed since we are using cache mounted from the host
ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} \
Expand Down
1 change: 0 additions & 1 deletion airflow-core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ 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]",
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/doc/ci/02_images.md
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,8 @@ 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.0.1` | `pip` version used. |
| `AIRFLOW_UV_VERSION` | `0.10.12` | `uv` version used. |
| `AIRFLOW_PREK_VERSION` | `0.3.6` | `prek` version used. |
| `AIRFLOW_UV_VERSION` | `0.11.1` | `uv` version used. |
| `AIRFLOW_PREK_VERSION` | `0.3.8` | `prek` version used. |
| `AIRFLOW_USE_UV` | `true` | Whether to use UV for installation. |
| `PIP_PROGRESS_BAR` | `on` | Progress bar for PIP installation |

Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_ci-image_build.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
52f338c973e63396bbffd450b229d6c9
6f9021a610b04f0853dcb38f80059cc2
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_ci_upgrade.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aad5200916061836455394f1a8fa0355
fb7d9c3f3084eefed384c3626a0cfcdd
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_prod-image_build.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7def92d438b944e1f957b30ba27fc28d
9e7d3206e8ca56abb72cae9ec1342822
Original file line number Diff line number Diff line change
@@ -1 +1 @@
54e2b0011ac0808cf7732ddb5714cebd
e27a6e759f82c1fb8639a32f8f6ef1ff
Original file line number Diff line number Diff line change
@@ -1 +1 @@
722c0325436d8d9b9bf5537332bb0752
6f38f05b84f4aa4a5e41e2f7e7ee4318
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_shell.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ecea925c00698d732a7b8bcdbabb6b2e
95bba676df9c9dccc5b0798fbc269f6e
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_start-airflow.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
627a0e67ae335777c6d974c71c1de7ac
a76fae2707fcab0cc46a68f1186c6a08
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_testing_core-tests.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e89451fe0b493819e12e78316a070cee
172b27f30c0867e08ca9f2ef11da2c94
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_testing_providers-tests.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9372d4ac91f1f8aec84665bd5bbc7dc6
446f03c4e5fa14f9836f160d7f1557b7
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_testing_system-tests.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0cdb967ba346e6663ac663acf599b5ae
56ea5a7ea76ffad80f4f91cf8a5566d5
5 changes: 4 additions & 1 deletion dev/breeze/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies = [
"jinja2>=3.1.5",
"jsonschema>=4.19.1",
"packaging>=25.0",
"prek>=0.3.6",
"prek>=0.3.8",
"psutil>=5.9.6",
"pygithub>=2.1.1",
"pytest-xdist>=3.3.1",
Expand Down Expand Up @@ -116,6 +116,9 @@ tmp_path_retention_policy = "failed"
extend = "../../pyproject.toml"
src = ["src"]

[tool.uv]
# Synchroonize with scripts/ci/prek/upgrade_important_versions.py
exclude-newer = "4 days"

[tool.mypy]
ignore_missing_imports = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ class VersionedFile(NamedTuple):


AIRFLOW_PIP_VERSION = "26.0.1"
AIRFLOW_UV_VERSION = "0.10.12"
AIRFLOW_UV_VERSION = "0.11.1"
AIRFLOW_USE_UV = False
GITPYTHON_VERSION = "3.1.46"
RICH_VERSION = "14.3.3"
PREK_VERSION = "0.3.6"
PREK_VERSION = "0.3.8"
HATCH_VERSION = "1.16.5"
PYYAML_VERSION = "6.0.3"

Expand Down Expand Up @@ -3363,7 +3363,7 @@ def split_date_version_and_suffix(file_name: str, suffix: str) -> VersionedFile:
AIRFLOW_ROOT_PATH / "airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml"
)
TARGET_API_YAML_PATH = PYTHON_CLIENT_DIR_PATH / "v2.yaml"
OPENAPI_GENERATOR_CLI_VER = "7.20.0"
OPENAPI_GENERATOR_CLI_VER = "7.21.0"

GENERATED_CLIENT_DIRECTORIES_TO_COPY: list[Path] = [
Path("airflow_client") / "client",
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 @@ -281,7 +281,7 @@ def get_allowed_llm_models() -> list[str]:
ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb"]

PIP_VERSION = "26.0.1"
UV_VERSION = "0.10.12"
UV_VERSION = "0.11.1"

# packages that providers docs
REGULAR_DOC_PACKAGES = [
Expand Down
Loading
Loading