Skip to content

Commit

Permalink
Upgrade pip and uv (apache#46075)
Browse files Browse the repository at this point in the history
  • Loading branch information
potiuk authored and niklasr22 committed Feb 8, 2025
1 parent 4a35968 commit 9f15f0c
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/actions/install-pre-commit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ inputs:
default: "3.9"
uv-version:
description: 'uv version to use'
default: "0.5.23" # Keep this comment to allow automatic replacement of uv version
default: "0.5.24" # Keep this comment to allow automatic replacement of uv version
pre-commit-version:
description: 'pre-commit version to use'
default: "4.1.0" # Keep this comment to allow automatic replacement of pre-commit version
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm"
# You can swap comments between those two args to test pip from the main version
# When you attempt to test if the version of `pip` from specified branch works for our builds
# Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
ARG AIRFLOW_PIP_VERSION=24.3.1
ARG AIRFLOW_PIP_VERSION=25.0
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.5.23
ARG AIRFLOW_UV_VERSION=0.5.24
ARG AIRFLOW_USE_UV="false"
ARG UV_HTTP_TIMEOUT="300"
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -1259,9 +1259,9 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
# You can swap comments between those two args to test pip from the main version
# When you attempt to test if the version of `pip` from specified branch works for our builds
# Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
ARG AIRFLOW_PIP_VERSION=24.3.1
ARG AIRFLOW_PIP_VERSION=25.0
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.5.23
ARG AIRFLOW_UV_VERSION=0.5.24
# TODO(potiuk): automate with upgrade check (possibly)
ARG AIRFLOW_PRE_COMMIT_VERSION="4.1.0"
ARG AIRFLOW_PRE_COMMIT_UV_VERSION="4.1.4"
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 @@ -442,8 +442,8 @@ can be used for CI images:
| `DEV_APT_DEPS` | | Dev APT dependencies installed in the first part of the image (default empty means default dependencies are used) |
| `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` | `24.3.1` | `pip` version used. |
| `AIRFLOW_UV_VERSION` | `0.5.23` | `uv` version used. |
| `AIRFLOW_PIP_VERSION` | `25.0` | `pip` version used. |
| `AIRFLOW_UV_VERSION` | `0.5.24` | `uv` version used. |
| `AIRFLOW_PRE_COMMIT_VERSION` | `4.1.0` | `pre-commit` version used. |
| `AIRFLOW_PRE_COMMIT_UV_VERSION` | `4.1.4` | `pre-commit-uv` version used. |
| `AIRFLOW_USE_UV` | `true` | Whether to use UV for installation. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ class VersionedFile(NamedTuple):
file_name: str


AIRFLOW_PIP_VERSION = "24.3.1"
AIRFLOW_UV_VERSION = "0.5.23"
AIRFLOW_PIP_VERSION = "25.0"
AIRFLOW_UV_VERSION = "0.5.24"
AIRFLOW_USE_UV = False
# TODO: automate these as well
WHEEL_VERSION = "0.44.0"
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/src/airflow_breeze/global_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@

ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]

PIP_VERSION = "24.3.1"
UV_VERSION = "0.5.23"
PIP_VERSION = "25.0"
UV_VERSION = "0.5.24"

DEFAULT_UV_HTTP_TIMEOUT = 300
DEFAULT_WSL2_HTTP_TIMEOUT = 900
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/install_breeze.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../../"

PYTHON_ARG=""

PIP_VERSION="24.3.1"
UV_VERSION="0.5.23"
PIP_VERSION="25.0"
UV_VERSION="0.5.24"
if [[ ${PYTHON_VERSION=} != "" ]]; then
PYTHON_ARG="--python=$(which python"${PYTHON_VERSION}") "
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/setup_breeze
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COLOR_YELLOW=$'\e[33m'
COLOR_BLUE=$'\e[34m'
COLOR_RESET=$'\e[0m'

UV_VERSION="0.5.23"
UV_VERSION="0.5.24"

function manual_instructions() {
echo
Expand Down

0 comments on commit 9f15f0c

Please sign in to comment.