From 3101bd4cf6e42722f024bc535223928f158449f1 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Sun, 22 May 2022 12:39:03 +0200 Subject: [PATCH] Upgrade `pip` to 22.1.1 version (just released) --- 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 315a8908dc19d..4c567927ab40d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ ARG AIRFLOW_VERSION="2.3.0" ARG PYTHON_BASE_IMAGE="python:3.7-slim-bullseye" -ARG AIRFLOW_PIP_VERSION=22.1.0 +ARG AIRFLOW_PIP_VERSION=22.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" @@ -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.0" + export AIRFLOW_PIP_VERSION="22.1.1" fi fi } diff --git a/Dockerfile.ci b/Dockerfile.ci index 14b6a49d828a1..457eaf9aa4319 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.0" + export AIRFLOW_PIP_VERSION="22.1.1" 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.0 +ARG AIRFLOW_PIP_VERSION=22.1.1 # 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 85427e2371028..0a16bf18b7e8d 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.0`` | PIP version used. | +| ``AIRFLOW_PIP_VERSION`` | ``22.1.1`` | 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 ca3747e6fb306..57de81e04292f 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.0). +problem from `pip` output (state as of `pip` 22.1.1). 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 d7edc2a386f4e..74078c84dd6a7 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.0`` | PIP version used. | +| ``AIRFLOW_PIP_VERSION`` | ``22.1.1`` | 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 f1c541d502730..063c184f1c9ce 100644 --- a/scripts/ci/libraries/_initialization.sh +++ b/scripts/ci/libraries/_initialization.sh @@ -418,7 +418,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.0"} + AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION:="22.1.1"} 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 35c3f56928f04..3ff9f716a585c 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.0" + export AIRFLOW_PIP_VERSION="22.1.1" fi fi }