[airflow] branch main updated: Upgrade to Pip 22.2 (#25218)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 1cb16d5588 Upgrade to Pip 22.2 (#25218)
1cb16d5588 is described below

commit 1cb16d5588306fcb7177486dc60c1974ea3034d4
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Fri Jul 22 01:25:25 2022 +0200

    Upgrade to Pip 22.2 (#25218)
    
    The 22.2 version of `pip` has **just** been released. Looks like
    it does not break neither constraints nor "eager upgrade" builds
    when we build images locally so it's safe to update to it in main.
---
 Dockerfile                              | 4 ++--
 Dockerfile.ci                           | 4 ++--
 scripts/ci/libraries/_initialization.sh | 2 +-
 scripts/docker/common.sh                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7fd6b8bbf6..fd2ce8076b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ ARG AIRFLOW_VERSION="2.3.3"
 
 ARG PYTHON_BASE_IMAGE="python:3.7-slim-bullseye"
 
-ARG AIRFLOW_PIP_VERSION=22.1.2
+ARG AIRFLOW_PIP_VERSION=22.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.2"
+            export AIRFLOW_PIP_VERSION="22.2"
         fi
     fi
 }
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 556b21ecc1..d48eb9eaf1 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.2"
+            export AIRFLOW_PIP_VERSION="22.2"
         fi
     fi
 }
@@ -1112,7 +1112,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.2
+ARG AIRFLOW_PIP_VERSION=22.2
 # Setup PIP
 # By default PIP install run without cache to make image smaller
 ARG PIP_NO_CACHE_DIR="true"
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 6916e6b9eb..f0123552e0 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -403,7 +403,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.2"}
+    AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION:="22.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 dd35b2be35..3bf7043535 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.2"
+            export AIRFLOW_PIP_VERSION="22.2"
         fi
     fi
 }