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 bcd11dac42 Upgrade `pip` to 23.3.1 (#35150)
bcd11dac42 is described below
commit bcd11dac42737ae161d79134f6aefbf08778041b
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Tue Oct 24 16:38:11 2023 +0200
Upgrade `pip` to 23.3.1 (#35150)
---
Dockerfile | 8 ++++----
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, 11 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index e04ce51f01..1849db6f55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ ARG AIRFLOW_VERSION="2.7.2"
ARG PYTHON_BASE_IMAGE="python:3.8-slim-bullseye"
-ARG AIRFLOW_PIP_VERSION=23.3
+ARG AIRFLOW_PIP_VERSION=23.3.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";
@@ -519,7 +519,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"
+ export AIRFLOW_PIP_VERSION="23.3.1"
fi
fi
}
@@ -1280,7 +1280,7 @@ COPY --from=scripts install_mysql.sh install_mssql.sh
install_postgres.sh /scrip
# 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
+ARG AIRFLOW_PIP_VERSION=23.3.1
ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION}
COPY --from=scripts common.sh /scripts/docker/
@@ -1476,7 +1476,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
+ARG AIRFLOW_PIP_VERSION=23.3.1
ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION}
COPY --from=scripts common.sh /scripts/docker/
diff --git a/Dockerfile.ci b/Dockerfile.ci
index cd7cd3fa1d..22a1b59a30 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -479,7 +479,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"
+ export AIRFLOW_PIP_VERSION="23.3.1"
fi
fi
}
@@ -1343,7 +1343,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
+ARG AIRFLOW_PIP_VERSION=23.3.1
ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION}
COPY --from=scripts common.sh /scripts/docker/
@@ -1408,7 +1408,7 @@ ARG AIRFLOW_CI_BUILD_EPOCH="5"
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.3
+ARG AIRFLOW_PIP_VERSION=23.3.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 3ea4fa6eb5..db825ecf5b 100644
--- a/IMAGES.rst
+++ b/IMAGES.rst
@@ -462,7 +462,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.3``
| PIP version used. |
+| ``AIRFLOW_PIP_VERSION`` | ``23.3.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 dc7250f5b3..c6b57276c1 100644
--- a/dev/breeze/src/airflow_breeze/global_constants.py
+++ b/dev/breeze/src/airflow_breeze/global_constants.py
@@ -101,7 +101,7 @@ if MYSQL_INNOVATION_RELEASE:
ALLOWED_MSSQL_VERSIONS = ["2017-latest", "2019-latest"]
-PIP_VERSION = "23.3"
+PIP_VERSION = "23.3.1"
# key used for generating providers index
PROVIDERS_INDEX_KEY = "providers-index"
diff --git a/docs/docker-stack/build-arg-ref.rst
b/docs/docker-stack/build-arg-ref.rst
index 39fe4bcb21..671ba6240f 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``
| PIP version used. |
+| ``AIRFLOW_PIP_VERSION`` | ``23.3.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 09bf1db927..701f1242f7 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"
+ export AIRFLOW_PIP_VERSION="23.3.1"
fi
fi
}
