From 689780887cb60e68eeed667a839061048c36137e Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Sat, 22 Apr 2023 12:40:57 +0200 Subject: [PATCH] Upgrade to pip 23.1.1 (#30808) Just released, fresh off-the-press bugifx version of pip. --- Dockerfile | 6 +++--- Dockerfile.ci | 6 +++--- IMAGES.rst | 2 +- dev/breeze/src/airflow_breeze/global_constants.py | 2 +- docs/docker-stack/build-arg-ref.rst | 2 +- scripts/docker/common.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index b99505cb4cf99..8b6bfa38f75bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ ARG AIRFLOW_VERSION="2.5.3" ARG PYTHON_BASE_IMAGE="python:3.7-slim-bullseye" -ARG AIRFLOW_PIP_VERSION=23.1 +ARG AIRFLOW_PIP_VERSION=23.1.1 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" @@ -433,7 +433,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.1" + export AIRFLOW_PIP_VERSION="23.1.1" fi fi } @@ -1241,7 +1241,7 @@ COPY --chown=airflow:0 ${AIRFLOW_SOURCES_FROM} ${AIRFLOW_SOURCES_TO} ARG ADDITIONAL_PYTHON_DEPS="" # Those are additional constraints that are needed for some extras but we do not want to -# force them on the main Airflow package. Currently we need no extra limits as PIP 23.1 has much better +# force them on the main Airflow package. Currently we need no extra limits as PIP 23.1+ has much better # dependency resolution and we do not need to limit the versions of the dependencies # !!! MAKE SURE YOU SYNCHRONIZE THE LIST BETWEEN: Dockerfile, Dockerfile.ci ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="" diff --git a/Dockerfile.ci b/Dockerfile.ci index 5a54e531994da..7197c2fdd60a8 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -393,7 +393,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.1" + export AIRFLOW_PIP_VERSION="23.1.1" fi fi } @@ -1309,7 +1309,7 @@ ARG AIRFLOW_CI_BUILD_EPOCH="4"0 ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true" # By default in the image, we are installing all providers when installing from sources ARG INSTALL_PROVIDERS_FROM_SOURCES="true" -ARG AIRFLOW_PIP_VERSION=23.1 +ARG AIRFLOW_PIP_VERSION=23.1.1 # Setup PIP # By default PIP install run without cache to make image smaller ARG PIP_NO_CACHE_DIR="true" @@ -1361,7 +1361,7 @@ ENV AIRFLOW_REPO=${AIRFLOW_REPO}\ RUN echo "Airflow version: ${AIRFLOW_VERSION}" # Those are additional constraints that are needed for some extras but we do not want to -# force them on the main Airflow package. Currently we need no extra limits as PIP 23.1 has much better +# force them on the main Airflow package. Currently we need no extra limits as PIP 23.1+ has much better # dependency resolution and we do not need to limit the versions of the dependencies # !!! MAKE SURE YOU SYNCHRONIZE THE LIST BETWEEN: Dockerfile, Dockerfile.ci ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="" diff --git a/IMAGES.rst b/IMAGES.rst index d54d840b001e5..344f3bf490f69 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -457,7 +457,7 @@ The following build arguments (``--build-arg`` in docker build command) can be u | ``ADDITIONAL_DEV_APT_ENV`` | | Additional env variables defined | | | | when installing dev deps | +------------------------------------------+------------------------------------------+------------------------------------------+ -| ``AIRFLOW_PIP_VERSION`` | ``23.1`` | PIP version used. | +| ``AIRFLOW_PIP_VERSION`` | ``23.1.1`` | PIP version used. | +------------------------------------------+------------------------------------------+------------------------------------------+ | ``PIP_PROGRESS_BAR`` | ``on`` | Progress bar for PIP installation | +------------------------------------------+------------------------------------------+------------------------------------------+ diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py index 49cbf6be606ce..997e2ec54385c 100644 --- a/dev/breeze/src/airflow_breeze/global_constants.py +++ b/dev/breeze/src/airflow_breeze/global_constants.py @@ -81,7 +81,7 @@ ALLOWED_MYSQL_VERSIONS = ["5.7", "8"] ALLOWED_MSSQL_VERSIONS = ["2017-latest", "2019-latest"] -PIP_VERSION = "23.1" +PIP_VERSION = "23.1.1" @lru_cache(maxsize=None) diff --git a/docs/docker-stack/build-arg-ref.rst b/docs/docker-stack/build-arg-ref.rst index 74ce10b942457..f50a5ed949313 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.1`` | PIP version used. | +| ``AIRFLOW_PIP_VERSION`` | ``23.1.1`` | PIP version used. | +------------------------------------------+------------------------------------------+---------------------------------------------+ | ``ADDITIONAL_PIP_INSTALL_FLAGS`` | | additional ``pip`` flags passed to the | | | | installation commands (except when | diff --git a/scripts/docker/common.sh b/scripts/docker/common.sh index 2e22268573cff..542f003a862e6 100644 --- a/scripts/docker/common.sh +++ b/scripts/docker/common.sh @@ -42,7 +42,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.1" + export AIRFLOW_PIP_VERSION="23.1.1" fi fi }