This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-4-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit e60d2b5b88c6a45bddc1e671c8495ae04e32ecfe
Author: Jarek Potiuk <jarek.pot...@polidea.com>
AuthorDate: Thu Sep 8 21:04:42 2022 +0200
Limit eager upgrade of protobuf library to < 4.21.0 (#26243)
* Limit eager upgrade of protobuf library to < 4.21.0
Until all the Google client libraries get upgraded to >= 2.0.0, we need to
limit the protobuf version.
(cherry picked from commit c6053f52908d6f1605b5e9a0566a653e90cc2d0e)
---
Dockerfile | 6 +++++-
Dockerfile.ci | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 92dbe933f4..74d0821962 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1211,7 +1211,11 @@ ARG ADDITIONAL_PYTHON_DEPS=""
# * dill<0.3.3 required by apache-beam
# * pyarrow>=6.0.0 is because pip resolver decides for Python 3.10 to
downgrade pyarrow to 5 even if it is OK
# for python 3.10 and other dependencies adding the limit helps resolver to
make better decisions
-ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0"
+# We need to limit the protobuf library to < 4.21.0 because not all google
libraries we use
+# are compatible with the new protobuf version. All the google python client
libraries need
+# to be upgraded to >=2.0.0 in order to able to lift that limitation
+#
https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0
protobuf<4.21.0"
ENV ADDITIONAL_PYTHON_DEPS=${ADDITIONAL_PYTHON_DEPS} \
INSTALL_PACKAGES_FROM_CONTEXT=${INSTALL_PACKAGES_FROM_CONTEXT} \
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 722a130d77..5498a16f7c 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1133,7 +1133,11 @@ RUN echo "Airflow version: ${AIRFLOW_VERSION}"
# * dill<0.3.3 required by apache-beam
# * pyarrow>=6.0.0 is because pip resolver decides for Python 3.10 to
downgrade pyarrow to 5 even if it is OK
# for python 3.10 and other dependencies adding the limit helps resolver to
make better decisions
-ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0"
+# We need to limit the protobuf library to < 4.21.0 because not all google
libraries we use
+# are compatible with the new protobuf version. All the google python client
libraries need
+# to be upgraded to >= 2.0.0 in order to able to lift that limitation
+#
https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0
protobuf<4.21.0"
ARG UPGRADE_TO_NEWER_DEPENDENCIES="false"
ENV
EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS=${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS} \
UPGRADE_TO_NEWER_DEPENDENCIES=${UPGRADE_TO_NEWER_DEPENDENCIES}
