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/install-prek/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ inputs:
default: "0.9.18" # Keep this comment to allow automatic replacement of uv version
prek-version:
description: 'prek version to use'
default: "0.2.23" # Keep this comment to allow automatic replacement of prek version
default: "0.2.25" # Keep this comment to allow automatic replacement of prek version
save-cache:
description: "Whether to save prek cache"
required: true
Expand Down
16 changes: 1 addition & 15 deletions .github/workflows/basic-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,20 +301,15 @@ jobs:
--hook-stage manual upgrade-important-versions || true
if: always()
env:
UPGRADE_UV: "true"
UPGRADE_PIP: "false"
UPGRADE_PYTHON: "false"
UPGRADE_GOLANG: "false"
UPGRADE_PREK: "true"
UPGRADE_NODE_LTS: "false"
UPGRADE_HATCH: "false"
UPGRADE_PYYAML: "false"
UPGRADE_GITPYTHON: "false"
UPGRADE_RICH: "false"
UPGRADE_RUFF: "false"
UPGRADE_MPROCS: "true"
UPGRADE_MYPY: "false"
UPGRADE_PROTOC: "false"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Run automated upgrade for important versions minus uv (failing if needed)"
run: |
Expand All @@ -328,19 +323,10 @@ jobs:
if: always()
env:
UPGRADE_UV: "false"
UPGRADE_PIP: "true"
UPGRADE_PYTHON: "true"
UPGRADE_GOLANG: "true"
UPGRADE_PREK: "false"
UPGRADE_NODE_LTS: "true"
UPGRADE_HATCH: "true"
UPGRADE_PYYAML: "true"
UPGRADE_GITPYTHON: "true"
UPGRADE_RICH: "true"
UPGRADE_RUFF: "true"
UPGRADE_MYPY: "true"
UPGRADE_MPROCS: "false"
UPGRADE_PROTOC: "false"
UPGRADE_OPENAPI_GENERATOR: "false"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

test-airflow-release-commands:
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,7 @@ repos:
^.*RELEASE_NOTES\.rst$|
^scripts/ci/docker-compose/integration-keycloak\.yml$|
^scripts/ci/docker-compose/keycloak/keycloak-entrypoint\.sh$|
^scripts/ci/prek/upgrade_important_versions.py$|
^scripts/ci/prek/vendor_k8s_json_schema\.py$
- id: check-base-operator-partial-arguments
name: Check BaseOperator and partial() arguments
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ ARG AIRFLOW_PYTHON_VERSION="3.12.12"
# Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
ARG AIRFLOW_PIP_VERSION=25.3
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.9.18
ARG AIRFLOW_UV_VERSION=0.9.19
ARG AIRFLOW_USE_UV="false"
ARG UV_HTTP_TIMEOUT="300"
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -1619,7 +1619,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.1"
ARG MPROCS_VERSION="0.8.2"

RUN SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]') \
&& PLATFORM="$(uname -m)" \
Expand Down Expand Up @@ -1710,8 +1710,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=25.3
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.9.18
ARG AIRFLOW_PREK_VERSION="0.2.23"
ARG AIRFLOW_UV_VERSION=0.9.19
ARG AIRFLOW_PREK_VERSION="0.2.25"

# UV_LINK_MODE=copy is needed since we are using cache mounted from the host
ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} \
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 @@ -444,7 +444,7 @@ can be used for CI images:
| `ADDITIONAL_DEV_APT_ENV` | | Additional env variables defined when installing dev deps |
| `AIRFLOW_PIP_VERSION` | `25.3` | `pip` version used. |
| `AIRFLOW_UV_VERSION` | `0.9.18` | `uv` version used. |
| `AIRFLOW_PREK_VERSION` | `0.2.23` | `prek` version used. |
| `AIRFLOW_PREK_VERSION` | `0.2.25` | `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/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies = [
"jinja2>=3.1.5",
"jsonschema>=4.19.1",
"packaging>=25.0",
"prek>=0.2.23",
"prek>=0.2.25",
"psutil>=5.9.6",
"pygithub>=2.1.1",
"pytest-xdist>=3.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ class VersionedFile(NamedTuple):
AIRFLOW_USE_UV = False
GITPYTHON_VERSION = "3.1.45"
RICH_VERSION = "14.2.0"
PREK_VERSION = "0.2.23"
PREK_VERSION = "0.2.25"
HATCH_VERSION = "1.16.2"
PYYAML_VERSION = "6.0.3"

Expand Down Expand Up @@ -3322,7 +3322,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.13.0"
OPENAPI_GENERATOR_CLI_VER = "7.18.0"

GENERATED_CLIENT_DIRECTORIES_TO_COPY: list[Path] = [
Path("airflow_client") / "client",
Expand Down
Loading