From 40d92d4b8026770e9ff0949454f627bee4367931 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Mon, 7 Nov 2022 11:13:30 +0100 Subject: [PATCH] Synchronize eager upgrade limits in all places where they are used --- Dockerfile | 5 ++++- Dockerfile.ci | 1 + .../src/airflow_breeze/utils/find_newer_dependencies.py | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b2d3d74840e6..fce560d0bd470 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1232,7 +1232,10 @@ ARG ADDITIONAL_PYTHON_DEPS="" # 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" +# * authlib, gcloud_aio_auth, adal are needed to generate constraints for PyPI packages and can be removed after we release +# new google, azure providers +# !!! MAKE SURE YOU SYNCHRONIZE THE LIST BETWEEN: Dockerfile, Dockerfile.ci, find_newer_dependencies.py +ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0 protobuf<4.21.0 authlib>=1.0.0 gcloud_aio_auth>=4.0.0 adal>=1.2.7" ENV ADDITIONAL_PYTHON_DEPS=${ADDITIONAL_PYTHON_DEPS} \ INSTALL_PACKAGES_FROM_CONTEXT=${INSTALL_PACKAGES_FROM_CONTEXT} \ diff --git a/Dockerfile.ci b/Dockerfile.ci index 8019e04d2035b..149bfc17f44d6 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1155,6 +1155,7 @@ RUN echo "Airflow version: ${AIRFLOW_VERSION}" # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates # * authlib, gcloud_aio_auth, adal are needed to generate constraints for PyPI packages and can be removed after we release # new google, azure providers +# !!! MAKE SURE YOU SYNCHRONIZE THE LIST BETWEEN: Dockerfile, Dockerfile.ci, find_newer_dependencies.py ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0 protobuf<4.21.0 authlib>=1.0.0 gcloud_aio_auth>=4.0.0 adal>=1.2.7" ARG UPGRADE_TO_NEWER_DEPENDENCIES="false" ENV EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS=${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS} \ diff --git a/dev/breeze/src/airflow_breeze/utils/find_newer_dependencies.py b/dev/breeze/src/airflow_breeze/utils/find_newer_dependencies.py index f0cf6ab58023c..ecedb8b35fffa 100644 --- a/dev/breeze/src/airflow_breeze/utils/find_newer_dependencies.py +++ b/dev/breeze/src/airflow_breeze/utils/find_newer_dependencies.py @@ -90,9 +90,11 @@ def find_newer_dependencies( for package, constrained_version in constrained_packages.items(): constraint_string += f' "{package}=={constrained_version}"' get_console().print("[info]Use the following pip install command (see the doc above for details)\n") + # !!! MAKE SURE YOU SYNCHRONIZE THE LIST BETWEEN: Dockerfile, Dockerfile.ci, find_newer_dependencies.py get_console().print( 'pip install ".[devel_all]" --upgrade --upgrade-strategy eager ' - '"dill<0.3.3" "pyarrow>=6.0.0" "protobuf<4.21.0"' + constraint_string, + '"dill<0.3.3" "pyarrow>=6.0.0" "protobuf<4.21.0" ' + '"authlib>=1.0.0" "gcloud_aio_auth>=4.0.0" "adal>=1.2.7"' + constraint_string, markup=False, soft_wrap=True, )