[airflow] branch main updated: Revert "Temporarily limit botocore upgrades (#31098)" (#31103)

[eladkal]

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 49cc213919 Revert "Temporarily limit botocore upgrades (#31098)" 
(#31103)
49cc213919 is described below

commit 49cc213919a7e2a5d4bdc9f952681fa4ef7bf923
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Fri May 5 22:32:51 2023 +0200

    Revert "Temporarily limit botocore upgrades (#31098)" (#31103)
    
    This reverts commit a6be96d92828a86e982b53646a9e2eeca00a5463.
    
    Fixes: #31087
---
 Dockerfile.ci                   | 5 +----
 scripts/docker/entrypoint_ci.sh | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index bf2b44bac1..6169b6066f 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1132,10 +1132,7 @@ if [[ ${UPGRADE_BOTO=} == "true" ]]; then
     echo "${COLOR_BLUE}Upgrading boto3, botocore to latest version to run 
Amazon tests with them${COLOR_RESET}"
     echo
     pip uninstall aiobotocore -y || true
-    # Temporarily limit upgrade of botocore to be less than 1.29.127
-    # in order to avoid failing on SQS tests
-    # See https://github.com/getmoto/moto/issues/6286 and 
https://github.com/apache/airflow/issues/31087
-    pip install --upgrade boto3 "botocore<1.29.127"
+    pip install --upgrade boto3 botocore
 fi
 readonly SELECTED_TESTS CLI_TESTS API_TESTS PROVIDERS_TESTS CORE_TESTS 
WWW_TESTS \
     ALL_TESTS ALL_PRESELECTED_TESTS
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index bdfd90f4b8..ca853e74c9 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -562,10 +562,7 @@ if [[ ${UPGRADE_BOTO=} == "true" ]]; then
     echo "${COLOR_BLUE}Upgrading boto3, botocore to latest version to run 
Amazon tests with them${COLOR_RESET}"
     echo
     pip uninstall aiobotocore -y || true
-    # Temporarily limit upgrade of botocore to be less than 1.29.127
-    # in order to avoid failing on SQS tests
-    # See https://github.com/getmoto/moto/issues/6286 and 
https://github.com/apache/airflow/issues/31087
-    pip install --upgrade boto3 "botocore<1.29.127"
+    pip install --upgrade boto3 botocore
 fi
 readonly SELECTED_TESTS CLI_TESTS API_TESTS PROVIDERS_TESTS CORE_TESTS 
WWW_TESTS \
     ALL_TESTS ALL_PRESELECTED_TESTS