From ee4aae00b1835b057b2fb5172d536e1adef0fd70 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 29 Jul 2022 18:29:12 +0900 Subject: [PATCH 1/4] ARROW-17250: [CI][Conan] Enable utf8proc automatically --- ci/conan/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py index 97acd839cd3..87a1f8c6932 100644 --- a/ci/conan/all/conanfile.py +++ b/ci/conan/all/conanfile.py @@ -237,7 +237,7 @@ def _with_thrift(self, required=False): def _with_utf8proc(self, required=False): if required or self.options.with_utf8proc == "auto": - return False + return self._compute() or self.gandiva else: return bool(self.options.with_utf8proc) From ffe442910af0829fe4a3e8563fec9a8ae615440d Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 30 Jul 2022 06:57:56 +0900 Subject: [PATCH 2/4] Fix variable --- ci/conan/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py index 87a1f8c6932..4b20ecdccac 100644 --- a/ci/conan/all/conanfile.py +++ b/ci/conan/all/conanfile.py @@ -237,7 +237,7 @@ def _with_thrift(self, required=False): def _with_utf8proc(self, required=False): if required or self.options.with_utf8proc == "auto": - return self._compute() or self.gandiva + return bool(self._compute() or self.options.gandiva) else: return bool(self.options.with_utf8proc) From 00de80ec040075f779b50d50e02cbec338d07ada Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 1 Aug 2022 11:54:34 +0900 Subject: [PATCH 3/4] Fix a typo --- ci/conan/all/conanfile.py | 2 +- dev/release/download_rc_binaries.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py index 4b20ecdccac..110f9bd9353 100644 --- a/ci/conan/all/conanfile.py +++ b/ci/conan/all/conanfile.py @@ -549,7 +549,7 @@ def package_info(self): if self._with_protobuf(): self.cpp_info.components["libarrow"].requires.append("protobuf::protobuf") if self._with_utf8proc(): - self.cpp_info.components["libarrow"].requires.append("uff8proc::uff8proc") + self.cpp_info.components["libarrow"].requires.append("utf8proc::utf8proc") if self._with_thrift(): self.cpp_info.components["libarrow"].requires.append("thrift::thrift") if self.options.with_backtrace: diff --git a/dev/release/download_rc_binaries.py b/dev/release/download_rc_binaries.py index ebd66a274d8..5401f11e8f2 100755 --- a/dev/release/download_rc_binaries.py +++ b/dev/release/download_rc_binaries.py @@ -105,8 +105,13 @@ def _download_file(self, dest, path): url = f'{self.URL_ROOT}/{path}' cmd = [ - 'curl', '--fail', '--location', '--retry', '5', - '--output', dest_path, url + 'curl', + '--fail', + '--location', + '--output', dest_path, + '--retry', '5', + '--retry-all-errors', + url, ] proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) From 9ab9f6d19f90116c0ae2843e03839a6926a10f99 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 1 Aug 2022 12:24:07 +0900 Subject: [PATCH 4/4] Revert a needless change --- dev/release/download_rc_binaries.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dev/release/download_rc_binaries.py b/dev/release/download_rc_binaries.py index 5401f11e8f2..ebd66a274d8 100755 --- a/dev/release/download_rc_binaries.py +++ b/dev/release/download_rc_binaries.py @@ -105,13 +105,8 @@ def _download_file(self, dest, path): url = f'{self.URL_ROOT}/{path}' cmd = [ - 'curl', - '--fail', - '--location', - '--output', dest_path, - '--retry', '5', - '--retry-all-errors', - url, + 'curl', '--fail', '--location', '--retry', '5', + '--output', dest_path, url ] proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)