From e64f7a43b67f3715f49c3e6fcbc73d646369a81f Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Thu, 8 Feb 2024 05:48:58 +0100 Subject: [PATCH] Upgrade to just released `pip 24.0` (#37236) (cherry picked from commit e27f76e98aa2b0c78906110e85522df80081bc6e) --- Dockerfile | 6 +++--- Dockerfile.ci | 6 +++--- dev/breeze/doc/ci/02_images.md | 2 +- .../airflow_breeze/commands/release_management_commands.py | 2 +- dev/breeze/src/airflow_breeze/global_constants.py | 2 +- docs/docker-stack/build-arg-ref.rst | 2 +- scripts/ci/install_breeze.sh | 2 +- scripts/docker/common.sh | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e0b5c69e69300..6beb0f823750be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ ARG AIRFLOW_VERSION="2.8.1" ARG PYTHON_BASE_IMAGE="python:3.8-slim-bookworm" -ARG AIRFLOW_PIP_VERSION=23.3.2 +ARG AIRFLOW_PIP_VERSION=24.0 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" @@ -531,7 +531,7 @@ function common::get_airflow_version_specification() { function common::override_pip_version_if_needed() { if [[ -n ${AIRFLOW_VERSION} ]]; then if [[ ${AIRFLOW_VERSION} =~ ^2\.0.* || ${AIRFLOW_VERSION} =~ ^1\.* ]]; then - export AIRFLOW_PIP_VERSION="23.3.2" + export AIRFLOW_PIP_VERSION="24.0" fi fi } @@ -1496,7 +1496,7 @@ ENV PATH="${AIRFLOW_USER_HOME_DIR}/.local/bin:${PATH}" \ # THE 3 LINES ARE ONLY NEEDED IN ORDER TO MAKE PYMSSQL BUILD WORK WITH LATEST CYTHON # AND SHOULD BE REMOVED WHEN WORKAROUND IN install_mssql.sh IS REMOVED -ARG AIRFLOW_PIP_VERSION=23.3.2 +ARG AIRFLOW_PIP_VERSION=24.0 ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} COPY --from=scripts common.sh /scripts/docker/ diff --git a/Dockerfile.ci b/Dockerfile.ci index 9f40a65b3b697b..781c7eee4ee4af 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -491,7 +491,7 @@ function common::get_airflow_version_specification() { function common::override_pip_version_if_needed() { if [[ -n ${AIRFLOW_VERSION} ]]; then if [[ ${AIRFLOW_VERSION} =~ ^2\.0.* || ${AIRFLOW_VERSION} =~ ^1\.* ]]; then - export AIRFLOW_PIP_VERSION="23.3.2" + export AIRFLOW_PIP_VERSION="24.0" fi fi } @@ -1008,7 +1008,7 @@ RUN bash /scripts/docker/install_os_dependencies.sh dev # THE 3 LINES ARE ONLY NEEDED IN ORDER TO MAKE PYMSSQL BUILD WORK WITH LATEST CYTHON # AND SHOULD BE REMOVED WHEN WORKAROUND IN install_mssql.sh IS REMOVED -ARG AIRFLOW_PIP_VERSION=23.3.2 +ARG AIRFLOW_PIP_VERSION=24.0 ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} COPY --from=scripts common.sh /scripts/docker/ @@ -1071,7 +1071,7 @@ ARG DEFAULT_CONSTRAINTS_BRANCH="constraints-main" # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. ARG AIRFLOW_CI_BUILD_EPOCH="6" ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true" -ARG AIRFLOW_PIP_VERSION=23.3.2 +ARG AIRFLOW_PIP_VERSION=24.0 # Setup PIP # By default PIP install run without cache to make image smaller ARG PIP_NO_CACHE_DIR="true" diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md index b057a2254c708f..4c6fc2c016bb73 100644 --- a/dev/breeze/doc/ci/02_images.md +++ b/dev/breeze/doc/ci/02_images.md @@ -446,7 +446,7 @@ can be used for CI images: | `DEV_APT_DEPS` | Empty - install default dependencies (see `install_os_dependencies.sh`) | Dev APT dependencies installed in the first part of the image | | `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` | `23.3.2` | PIP version used. | +| `AIRFLOW_PIP_VERSION` | `24.0` | PIP version used. | | `PIP_PROGRESS_BAR` | `on` | Progress bar for PIP installation | Here are some examples of how CI images can built manually. CI is always diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py index a0a8f6f09d1d92..bd31a2e51822d1 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -210,7 +210,7 @@ class VersionedFile(NamedTuple): comparable_version: Version -AIRFLOW_PIP_VERSION = "23.3.2" +AIRFLOW_PIP_VERSION = "24.0" WHEEL_VERSION = "0.36.2" GITPYTHON_VERSION = "3.1.40" RICH_VERSION = "13.7.0" diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py index 9a9f371e16f15e..c3089a9f2f32ea 100644 --- a/dev/breeze/src/airflow_breeze/global_constants.py +++ b/dev/breeze/src/airflow_breeze/global_constants.py @@ -120,7 +120,7 @@ ALLOWED_MSSQL_VERSIONS = ["2017-latest", "2019-latest"] -PIP_VERSION = "23.3.2" +PIP_VERSION = "24.0" # packages that providers docs REGULAR_DOC_PACKAGES = [ diff --git a/docs/docker-stack/build-arg-ref.rst b/docs/docker-stack/build-arg-ref.rst index 4ea605a6dec3c4..a3dbf447add875 100644 --- a/docs/docker-stack/build-arg-ref.rst +++ b/docs/docker-stack/build-arg-ref.rst @@ -45,7 +45,7 @@ Those are the most common arguments that you use when you want to build a custom +------------------------------------------+------------------------------------------+---------------------------------------------+ | ``AIRFLOW_USER_HOME_DIR`` | ``/home/airflow`` | Home directory of the Airflow user. | +------------------------------------------+------------------------------------------+---------------------------------------------+ -| ``AIRFLOW_PIP_VERSION`` | ``23.3.2`` | PIP version used. | +| ``AIRFLOW_PIP_VERSION`` | ``24.0`` | PIP version used. | +------------------------------------------+------------------------------------------+---------------------------------------------+ | ``ADDITIONAL_PIP_INSTALL_FLAGS`` | | additional ``pip`` flags passed to the | | | | installation commands (except when | diff --git a/scripts/ci/install_breeze.sh b/scripts/ci/install_breeze.sh index e8e3a63f8050a0..7a61147f23fcae 100755 --- a/scripts/ci/install_breeze.sh +++ b/scripts/ci/install_breeze.sh @@ -19,7 +19,7 @@ set -euxo pipefail cd "$( dirname "${BASH_SOURCE[0]}" )/../../" -python -m pip install --upgrade pip==23.3.2 +python -m pip install --upgrade pip==24.0 python -m pip install "pipx>=1.4.1" python -m pipx install --editable ./dev/breeze/ --force echo '/home/runner/.local/bin' >> "${GITHUB_PATH}" diff --git a/scripts/docker/common.sh b/scripts/docker/common.sh index c01c15f97d6066..ddd80e19412436 100644 --- a/scripts/docker/common.sh +++ b/scripts/docker/common.sh @@ -43,7 +43,7 @@ function common::get_airflow_version_specification() { function common::override_pip_version_if_needed() { if [[ -n ${AIRFLOW_VERSION} ]]; then if [[ ${AIRFLOW_VERSION} =~ ^2\.0.* || ${AIRFLOW_VERSION} =~ ^1\.* ]]; then - export AIRFLOW_PIP_VERSION="23.3.2" + export AIRFLOW_PIP_VERSION="24.0" fi fi }