You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2022/11/07 16:15:14 UTC
[airflow] branch main updated: Synchronize eager upgrade limits in all places where they are used (#27539)
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 6307dc1acd Synchronize eager upgrade limits in all places where they are used (#27539)
6307dc1acd is described below
commit 6307dc1acd0d8dcfc206c7980ede1f3d26fb5984
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Nov 7 17:15:04 2022 +0100
Synchronize eager upgrade limits in all places where they are used (#27539)
---
Dockerfile | 5 ++++-
Dockerfile.ci | 1 +
dev/breeze/src/airflow_breeze/utils/find_newer_dependencies.py | 4 +++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6b2d3d7484..fce560d0bd 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 8019e04d20..149bfc17f4 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 f0cf6ab580..ecedb8b35f 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,
)