conda-forge · github-actions · Feb 13, 2022 · Feb 13, 2022 · Feb 13, 2022
diff --git a/...version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.7.____cpython.yaml b/...version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.7.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/...version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.8.____cpython.yaml b/...version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.8.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/...version7cuda_compiler_version10.2cxx_compiler_version7numpy1.19python3.9.____cpython.yaml b/...version7cuda_compiler_version10.2cxx_compiler_version7numpy1.19python3.9.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/...ersion7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml b/...ersion7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/...version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython.yaml b/...version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/...version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.8.____cpython.yaml b/...version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.8.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/...version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml b/...version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/...ersion9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/...ersion9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml
@@ -24,6 +24,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml
@@ -26,6 +26,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml
@@ -26,6 +26,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml
@@ -26,6 +26,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml
@@ -26,6 +26,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml
@@ -22,6 +22,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml
@@ -22,6 +22,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml
@@ -22,6 +22,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml
@@ -22,6 +22,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/migrations/orc173.yaml b/.ci_support/migrations/orc173.yaml
diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml
@@ -20,6 +20,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml
@@ -20,6 +20,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml
@@ -20,6 +20,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml
@@ -20,6 +20,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml
@@ -20,6 +20,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml
@@ -20,6 +20,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml
@@ -20,6 +20,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml
@@ -16,6 +16,8 @@ gflags:
 - '2.2'
 glog:
 - '0.5'
+google_cloud_cpp:
+- '1.35'
 grpc_cpp:
 - '1.43'
 libprotobuf:

diff --git a/recipe/8c4f77a9f35eb97a47a09a9555c27c9ca350bd5e.patch b/recipe/8c4f77a9f35eb97a47a09a9555c27c9ca350bd5e.patch
@@ -0,0 +1,23 @@
+From 8c4f77a9f35eb97a47a09a9555c27c9ca350bd5e Mon Sep 17 00:00:00 2001
+From: Carlos O'Ryan <[email protected]>
+Date: Sun, 6 Feb 2022 13:34:45 +0000
+Subject: [PATCH] Add explicit conversion
+
+Explicitly convert from `std::unique_ptr<Buffer>` to a `std::shared_ptr` on the way to convert to `Result<std::shared_ptr<>>`.  I am not sure why it only failed with one compiler.
+---
+ cpp/src/arrow/filesystem/gcsfs.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpp/src/arrow/filesystem/gcsfs.cc b/cpp/src/arrow/filesystem/gcsfs.cc
+index a61fef2246ea..1f719c3ffeb0 100644
+--- a/cpp/src/arrow/filesystem/gcsfs.cc
++++ b/cpp/src/arrow/filesystem/gcsfs.cc
+@@ -138,7 +138,7 @@ class GcsInputStream : public arrow::io::InputStream {
+     stream_.read(reinterpret_cast<char*>(buffer->mutable_data()), nbytes);
+     ARROW_GCS_RETURN_NOT_OK(stream_.status());
+     RETURN_NOT_OK(buffer->Resize(stream_.gcount(), true));
+-    return buffer;
++    return std::shared_ptr<Buffer>(std::move(buffer));
+   }
+   //@}
+
diff --git a/recipe/bld-arrow.bat b/recipe/bld-arrow.bat
@@ -38,6 +38,7 @@ cmake -G "Ninja" ^
       -DARROW_DATASET:BOOL=ON ^
       -DARROW_FLIGHT:BOOL=ON ^
       -DARROW_HDFS:BOOL=ON ^
+      -DARROW_GCS:BOOL=ON ^
       -DARROW_PARQUET:BOOL=ON ^
       -DARROW_GANDIVA:BOOL=ON ^
       -DARROW_ORC:BOOL=ON ^

diff --git a/recipe/build-arrow.sh b/recipe/build-arrow.sh
@@ -43,6 +43,12 @@ else
     EXTRA_CMAKE_ARGS=" ${EXTRA_CMAKE_ARGS} -DARROW_GANDIVA=ON"
 fi
 
+if [[ "${target_platform}" == osx-* ]]; then
+   EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=14"
+else
+   EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=17"
+fi
+
 cmake \
     -DARROW_BOOST_USE_SHARED=ON \
     -DARROW_BUILD_BENCHMARKS=OFF \
@@ -55,6 +61,7 @@ cmake \
     -DARROW_FLIGHT=ON \
     -DARROW_FLIGHT_REQUIRE_TLSCREDENTIALSOPTIONS=ON \
     -DARROW_HDFS=ON \
+    -DARROW_GCS=ON \
     -DARROW_JEMALLOC=ON \
     -DARROW_MIMALLOC=ON \
     -DARROW_ORC=ON \

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -13,9 +13,10 @@ source:
   sha256: e8f49b149a15ecef4e40fcfab1b87c113c6b1ee186005c169e5cdf95d31a99de
   patches:
     - 0001-ARROW-15551-C-FlightRPC-Update-gRPC-TLS-options-dete.patch
+    - 8c4f77a9f35eb97a47a09a9555c27c9ca350bd5e.patch
 
 build:
-  number: 1
+  number: 2
   # for cuda on win/linux, building with 9.2 is enough to be compatible with all later versions,
   # since arrow is only using libcuda, and not libcudart.
   skip: true  # [(win or linux) and cuda_compiler_version not in ("None", "10.2")]
@@ -77,6 +78,7 @@ outputs:
         - gflags
         - glog
         - grpc-cpp
+        - google-cloud-cpp
         - libprotobuf
         - clangdev 10  # [not (osx and arm64)]
         - llvmdev 10   # [not (osx and arm64)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,8 @@ gflags: @@
     - '2.2'
     glog:
     - '0.5'
+    google_cloud_cpp:
+    - '1.35'
     grpc_cpp:
     - '1.43'
     libprotobuf:
@@ Expand Down @@