Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE] Test pip 25.0 candidate #46062

Closed
wants to merge 1 commit into from
Closed
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ 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="git+https://github.com/pypa/pip@f47b5874299848c688336ae7c8d69534013fe2c6"
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.5.23
ARG AIRFLOW_USE_UV="false"
Expand Down Expand Up @@ -553,7 +553,7 @@ function common::install_packaging_tools() {
echo
echo "${COLOR_BLUE}(Re)Installing pip version: ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
echo
pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
pip install --root-user-action ignore --disable-pip-version-check "${AIRFLOW_PIP_VERSION}"
fi
fi
if [[ ${AIRFLOW_UV_VERSION=} == "" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ function common::install_packaging_tools() {
echo
echo "${COLOR_BLUE}(Re)Installing pip version: ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
echo
pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
pip install --root-user-action ignore --disable-pip-version-check "${AIRFLOW_PIP_VERSION}"
fi
fi
if [[ ${AIRFLOW_UV_VERSION=} == "" ]]; then
Expand Down Expand Up @@ -1218,7 +1218,7 @@ ARG AIRFLOW_VERSION=""
# Additional PIP flags passed to all pip install commands except reinstalling pip itself
ARG ADDITIONAL_PIP_INSTALL_FLAGS=""

ARG AIRFLOW_USE_UV="true"
ARG AIRFLOW_USE_UV="false"

ENV AIRFLOW_REPO=${AIRFLOW_REPO}\
AIRFLOW_BRANCH=${AIRFLOW_BRANCH} \
Expand Down Expand Up @@ -1259,7 +1259,7 @@ 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="git+https://github.com/pypa/pip@f47b5874299848c688336ae7c8d69534013fe2c6"
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
ARG AIRFLOW_UV_VERSION=0.5.23
# TODO(potiuk): automate with upgrade check (possibly)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class VersionedFile(NamedTuple):
file_name: str


AIRFLOW_PIP_VERSION = "24.3.1"
AIRFLOW_PIP_VERSION = "git+https://github.com/pypa/pip@f47b5874299848c688336ae7c8d69534013fe2c6"
AIRFLOW_UV_VERSION = "0.5.23"
AIRFLOW_USE_UV = False
# TODO: automate these as well
Expand All @@ -251,7 +251,7 @@ class VersionedFile(NamedTuple):
AIRFLOW_BUILD_DOCKERFILE = f"""
FROM python:{DEFAULT_PYTHON_MAJOR_MINOR_VERSION}-slim-{ALLOWED_DEBIAN_VERSIONS[0]}
RUN apt-get update && apt-get install -y --no-install-recommends git
RUN pip install --root-user-action ignore pip=={AIRFLOW_PIP_VERSION} hatch=={HATCH_VERSION} pyyaml=={PYYAML_VERSION}\
RUN pip install --root-user-action ignore "{AIRFLOW_PIP_VERSION}" hatch=={HATCH_VERSION} pyyaml=={PYYAML_VERSION}\
gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} pre-commit=={PRE_COMMIT_VERSION}
COPY . /opt/airflow
"""
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 @@ -188,7 +188,7 @@

ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]

PIP_VERSION = "24.3.1"
PIP_VERSION = "git+https://github.com/pypa/pip@f47b5874299848c688336ae7c8d69534013fe2c6"
UV_VERSION = "0.5.23"

DEFAULT_UV_HTTP_TIMEOUT = 300
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/src/airflow_breeze/utils/kubernetes_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,10 @@ def create_virtualenv(force_venv_setup: bool) -> RunCommandResult:
f"{venv_command_result.stdout}\n{venv_command_result.stderr}"
)
return venv_command_result
get_console().print(f"[info]Reinstalling pip=={PIP_VERSION} in {K8S_ENV_PATH}")
get_console().print(f"[info]Reinstalling {PIP_VERSION} in {K8S_ENV_PATH}")
command = create_pip_command(PYTHON_BIN_PATH)
pip_reinstall_result = run_command(
[*command, "install", f"pip=={PIP_VERSION}"],
[*command, "install", f"{PIP_VERSION}"],
check=False,
capture_output=True,
)
Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/src/airflow_breeze/utils/virtualenv_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def create_venv(
sys.exit(1)
if pip_version:
result = run_command(
[python_path.as_posix(), "-m", "pip", "install", f"pip=={pip_version}", "-q"],
[python_path.as_posix(), "-m", "pip", "install", f"{pip_version}", "-q"],
check=False,
capture_output=False,
text=True,
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,13 +21,13 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../../"

PYTHON_ARG=""

PIP_VERSION="24.3.1"
PIP_VERSION="git+https://github.com/pypa/pip@f47b5874299848c688336ae7c8d69534013fe2c6"
UV_VERSION="0.5.23"
if [[ ${PYTHON_VERSION=} != "" ]]; then
PYTHON_ARG="--python=$(which python"${PYTHON_VERSION}") "
fi

python -m pip install --upgrade "pip==${PIP_VERSION}"
python -m pip install --upgrade "${PIP_VERSION}"
python -m pip install "uv==${UV_VERSION}"
uv tool uninstall apache-airflow-breeze >/dev/null 2>&1 || true
# shellcheck disable=SC2086
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function common::install_packaging_tools() {
echo
echo "${COLOR_BLUE}(Re)Installing pip version: ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
echo
pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
pip install --root-user-action ignore --disable-pip-version-check "${AIRFLOW_PIP_VERSION}"
fi
fi
if [[ ${AIRFLOW_UV_VERSION=} == "" ]]; then
Expand Down
Loading