From a30852e06c9a7e5ea797adcd7be7cab2d92ee7a0 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 13 Oct 2021 15:53:19 +0200 Subject: [PATCH 1/3] ARROW-13134: [C++][CI] Unpin conda package for aws-sdk-cpp --- ci/conda_env_cpp.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt index 2b5fc32d711..d2ccb66a26b 100644 --- a/ci/conda_env_cpp.txt +++ b/ci/conda_env_cpp.txt @@ -15,8 +15,7 @@ # specific language governing permissions and limitations # under the License. -# workaround for https://issues.apache.org/jira/browse/ARROW-13134 -aws-sdk-cpp<1.9 +aws-sdk-cpp benchmark>=1.5.4 boost-cpp>=1.68.0 brotli From 2a92ed147dfec9b6926a1e180b0fb06de755a7e3 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 13 Oct 2021 17:01:07 +0200 Subject: [PATCH 2/3] Try to force a recent AWS SDK for testing --- ci/conda_env_cpp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt index d2ccb66a26b..8fcb3fb657f 100644 --- a/ci/conda_env_cpp.txt +++ b/ci/conda_env_cpp.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -aws-sdk-cpp +aws-sdk-cpp>=1.9 benchmark>=1.5.4 boost-cpp>=1.68.0 brotli From ea9422af488c0630a81dd70d1a2d9d89789ef004 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 13 Oct 2021 17:38:20 +0200 Subject: [PATCH 3/3] Revert "Try to force a recent AWS SDK for testing" This reverts commit 2a92ed147dfec9b6926a1e180b0fb06de755a7e3. --- ci/conda_env_cpp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt index 8fcb3fb657f..d2ccb66a26b 100644 --- a/ci/conda_env_cpp.txt +++ b/ci/conda_env_cpp.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -aws-sdk-cpp>=1.9 +aws-sdk-cpp benchmark>=1.5.4 boost-cpp>=1.68.0 brotli