This is an automated email from the ASF dual-hosted git repository.

eladkal 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 54dfead4cc Fix latest botocore tests to not conflict with apache-beam 
provider (#40502)
54dfead4cc is described below

commit 54dfead4ccfe7a5b41eab3433c5a38159434e014
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sun Jun 30 10:06:50 2024 +0200

    Fix latest botocore tests to not conflict with apache-beam provider (#40502)
    
    The apache-beam provider has certain expectations about requests
    that need to be included when we manually bump botocore to the
    latest version - to test if the latest version still works with
    non-aiobotocore tests.
    
    Added the requests reqiurement from apache.beam and also improved
    the comment on botocore update to explain where the requirements
    come from - also added displaying the actual command that is
    run to upgrade botocore..
---
 Dockerfile.ci                   | 10 +++++++---
 scripts/docker/entrypoint_ci.sh | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 942b92254c..403aa04740 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1017,11 +1017,15 @@ function check_boto_upgrade() {
     echo
     # shellcheck disable=SC2086
     ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs 
|| true
-    # We need to include oss2 as dependency as otherwise jmespath will be 
bumped and it will not pass
-    # the pip check test, Similarly gcloud-aio-auth limit is needed to be 
included as it bumps cryptography
+    # We need to include few dependencies to pass pip check with other 
dependencies:
+    #   * oss2 as dependency as otherwise jmespath will be bumped (sync with 
alibaba provider)
+    #   * gcloud-aio-auth limit is needed to be included as it bumps 
cryptography (sync with google provider)
+    #   * requests needs to be limited to be compatible with apache beam (sync 
with apache-beam provider)
+    set -x
     # shellcheck disable=SC2086
     ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 
botocore \
-       "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0"
+       "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" 
"requests!=2.32.*,<3.0.0,>=2.24.0"
+    set +x
     pip check
 }
 
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index 03d87d7248..b64a43fcfd 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -237,11 +237,15 @@ function check_boto_upgrade() {
     echo
     # shellcheck disable=SC2086
     ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs 
|| true
-    # We need to include oss2 as dependency as otherwise jmespath will be 
bumped and it will not pass
-    # the pip check test, Similarly gcloud-aio-auth limit is needed to be 
included as it bumps cryptography
+    # We need to include few dependencies to pass pip check with other 
dependencies:
+    #   * oss2 as dependency as otherwise jmespath will be bumped (sync with 
alibaba provider)
+    #   * gcloud-aio-auth limit is needed to be included as it bumps 
cryptography (sync with google provider)
+    #   * requests needs to be limited to be compatible with apache beam (sync 
with apache-beam provider)
+    set -x
     # shellcheck disable=SC2086
     ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 
botocore \
-       "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0"
+       "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" 
"requests!=2.32.*,<3.0.0,>=2.24.0"
+    set +x
     pip check
 }
 

Reply via email to