Skip to content

Commit

Permalink
Upgrade build installers and dependencies (#40177)
Browse files Browse the repository at this point in the history
We can now remove the 0.2.5 limit on uv after the issue we opened
astral-sh/uv#4136 has been addressed in 0.2.10

GitOrigin-RevId: 7c4ea23b4d5aa4fd757c0c3caef358d4cab486e9
  • Loading branch information
potiuk authored and Cloud Composer Team committed Nov 9, 2024
1 parent 6fab9e7 commit 29a9d90
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ ARG AIRFLOW_VERSION="2.9.2"
ARG PYTHON_BASE_IMAGE="python:3.8-slim-bookworm"

ARG AIRFLOW_PIP_VERSION=24.0
# until https://github.com/astral-sh/uv/issues/4136 is solved we limit UV to version 0.2.5
ARG AIRFLOW_UV_VERSION=0.2.5
ARG AIRFLOW_UV_VERSION=0.2.10
ARG AIRFLOW_USE_UV="false"
ARG UV_HTTP_TIMEOUT="300"
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -1268,8 +1268,7 @@ ARG DEFAULT_CONSTRAINTS_BRANCH="constraints-main"
ARG AIRFLOW_CI_BUILD_EPOCH="10"
ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true"
ARG AIRFLOW_PIP_VERSION=24.0
# until https://github.com/astral-sh/uv/issues/4136 is solved we limit UV to version 0.2.5
ARG AIRFLOW_UV_VERSION=0.2.5
ARG AIRFLOW_UV_VERSION=0.2.10
ARG AIRFLOW_USE_UV="true"
# Setup PIP
# By default PIP install run without cache to make image smaller
Expand All @@ -1293,8 +1292,7 @@ ARG AIRFLOW_VERSION=""
ARG ADDITIONAL_PIP_INSTALL_FLAGS=""

ARG AIRFLOW_PIP_VERSION=24.0
# until https://github.com/astral-sh/uv/issues/4136 is solved we limit UV to version 0.2.5
ARG AIRFLOW_UV_VERSION=0.2.5
ARG AIRFLOW_UV_VERSION=0.2.10
ARG AIRFLOW_USE_UV="true"

ENV AIRFLOW_REPO=${AIRFLOW_REPO}\
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ requires = [
"GitPython==3.1.43",
"gitdb==4.0.11",
"hatchling==1.24.2",
"packaging==24.0",
"packaging==24.1",
"pathspec==0.12.1",
"pluggy==1.5.0",
"smmap==5.0.1",
Expand Down

0 comments on commit 29a9d90

Please sign in to comment.