From 3addf59b51e0d6399bc969d56b5a36ac7865b417 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 23 Aug 2023 10:18:30 +0800 Subject: [PATCH 1/2] Limit boto3 to help resolution --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 25ff6f5a1def4..844a8d5e3a5e1 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1396,7 +1396,7 @@ RUN echo "Airflow version: ${AIRFLOW_VERSION}" # force them on the main Airflow package. Currently we need no extra limits as PIP 23.1+ has much better # dependency resolution and we do not need to limit the versions of the dependencies # aiobotocore is limited temporarily until it stops backtracking pip -ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="aiobotocore<2.6.0" +ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="aiobotocore<2.6.0 boto3<1.28.32" ARG UPGRADE_TO_NEWER_DEPENDENCIES="false" ARG VERSION_SUFFIX_FOR_PYPI="" From 5933511d99267cddf1ab11e5bc3c8898fa613544 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 23 Aug 2023 13:58:01 +0800 Subject: [PATCH 2/2] Better boto package combination --- Dockerfile.ci | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 844a8d5e3a5e1..96468ceb36cc6 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1393,10 +1393,11 @@ ENV AIRFLOW_REPO=${AIRFLOW_REPO}\ RUN echo "Airflow version: ${AIRFLOW_VERSION}" # Those are additional constraints that are needed for some extras but we do not want to -# force them on the main Airflow package. Currently we need no extra limits as PIP 23.1+ has much better -# dependency resolution and we do not need to limit the versions of the dependencies -# aiobotocore is limited temporarily until it stops backtracking pip -ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="aiobotocore<2.6.0 boto3<1.28.32" +# force them on the main Airflow package. +# Recent aiobotocore (2.6.0+) requires this specific botocore version, while +# boto3 1.28.17 is the last version supporting that, so we pin them to help pip +# avoid extra work. Revisit this when a new aiobotocore version is released. +ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="botocore==1.31.17 boto3<=1.28.17" ARG UPGRADE_TO_NEWER_DEPENDENCIES="false" ARG VERSION_SUFFIX_FOR_PYPI=""