From 81c099e0d1784d0da8c75ef89079b65edf280723 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Tue, 31 May 2022 16:49:47 +0200 Subject: [PATCH] Upgrade to pip 22.1.2 (#24043) Pip has been upgraded to version 22.1.2 12 minutes ago. Time to catch up. (cherry picked from commit 2247b6d43c81b345ab465c7cd2e97a3ab20b117a) --- Dockerfile | 4 ++-- Dockerfile.ci | 4 ++-- IMAGES.rst | 2 +- dev/TRACKING_BACKTRACKING_ISSUES.md | 2 +- docs/docker-stack/build-arg-ref.rst | 2 +- scripts/ci/libraries/_initialization.sh | 2 +- scripts/docker/common.sh | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58afdb2ac4fd3..39049dcb4d4ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ ARG AIRFLOW_VERSION="2.2.4" ARG PYTHON_BASE_IMAGE="python:3.7-slim-bullseye" -ARG AIRFLOW_PIP_VERSION=22.1.1 +ARG AIRFLOW_PIP_VERSION=22.1.2 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" @@ -367,7 +367,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="22.1.1" + export AIRFLOW_PIP_VERSION="22.1.2" fi fi } diff --git a/Dockerfile.ci b/Dockerfile.ci index 457eaf9aa4319..41aaf579ec749 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -327,7 +327,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="22.1.1" + export AIRFLOW_PIP_VERSION="22.1.2" fi fi } @@ -1195,7 +1195,7 @@ ARG AIRFLOW_CI_BUILD_EPOCH="3" 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=22.1.1 +ARG AIRFLOW_PIP_VERSION=22.1.2 # Setup PIP # By default PIP install run without cache to make image smaller ARG PIP_NO_CACHE_DIR="true" diff --git a/IMAGES.rst b/IMAGES.rst index 0a16bf18b7e8d..58ef0cca54852 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -475,7 +475,7 @@ The following build arguments (``--build-arg`` in docker build command) can be u | ``ADDITIONAL_RUNTIME_APT_ENV`` | | Additional env variables defined | | | | when installing runtime deps | +------------------------------------------+------------------------------------------+------------------------------------------+ -| ``AIRFLOW_PIP_VERSION`` | ``22.1.1`` | PIP version used. | +| ``AIRFLOW_PIP_VERSION`` | ``22.1.2`` | PIP version used. | +------------------------------------------+------------------------------------------+------------------------------------------+ | ``PIP_PROGRESS_BAR`` | ``on`` | Progress bar for PIP installation | +------------------------------------------+------------------------------------------+------------------------------------------+ diff --git a/dev/TRACKING_BACKTRACKING_ISSUES.md b/dev/TRACKING_BACKTRACKING_ISSUES.md index 57de81e04292f..27afc390ab7a0 100644 --- a/dev/TRACKING_BACKTRACKING_ISSUES.md +++ b/dev/TRACKING_BACKTRACKING_ISSUES.md @@ -42,7 +42,7 @@ image build jobs in CI. An example of such issue is described [here](https://github.com/pypa/pip/issues/10924). Unfortunately the problem is that in such cases, it is not possible to figure out what caused the -problem from `pip` output (state as of `pip` 22.1.1). +problem from `pip` output (state as of `pip` 22.1.2). There are a number of issues in `pip` that describe the issue, and some backtracking reasons have been already tracked down and fixed by `pip` maintainers, but this is a difficult problem to solve and it is likely it diff --git a/docs/docker-stack/build-arg-ref.rst b/docs/docker-stack/build-arg-ref.rst index 74078c84dd6a7..f8e30c02ce76e 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`` | ``22.1.1`` | PIP version used. | +| ``AIRFLOW_PIP_VERSION`` | ``22.1.2`` | PIP version used. | +------------------------------------------+------------------------------------------+---------------------------------------------+ | ``PIP_PROGRESS_BAR`` | ``on`` | Progress bar for PIP installation | +------------------------------------------+------------------------------------------+---------------------------------------------+ diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh index c79136f63dc52..e7c96b20b5092 100644 --- a/scripts/ci/libraries/_initialization.sh +++ b/scripts/ci/libraries/_initialization.sh @@ -422,7 +422,7 @@ function initialization::initialize_image_build_variables() { export INSTALLED_EXTRAS="async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,imap,ldap,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv" - AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION:="22.1.1"} + AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION:="22.1.2"} export AIRFLOW_PIP_VERSION # We also pin version of wheel used to get consistent builds diff --git a/scripts/docker/common.sh b/scripts/docker/common.sh index 3ff9f716a585c..dd35b2be35a1f 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="22.1.1" + export AIRFLOW_PIP_VERSION="22.1.2" fi fi }